updates

Author: michelle0927

components/snipcart/actions/create-discount/create-discount.mjs

@@ -14,12 +14,6 @@ export default {
         "name",
       ],
     },
-    maxNumberOfUsages: {
-      propDefinition: [
-        app,
-        "maxNumberOfUsages",
-      ],
-    },
     trigger: {
       propDefinition: [
         app,
@@ -32,15 +26,15 @@ export default {
         app,
         "code",
       ],
-      disabled: true,
+      optional: true,
       hidden: true,
     },
     totalToReach: {
       propDefinition: [
         app,
         "totalToReach",
       ],
-      disabled: true,
+      optional: true,
       hidden: true,
     },
     type: {
@@ -55,37 +49,42 @@ export default {
         app,
         "amount",
       ],
-      disabled: true,
+      optional: true,
       hidden: true,
     },
     rate: {
       propDefinition: [
         app,
         "rate",
       ],
-      disabled: true,
+      optional: true,
       hidden: true,
     },
+    maxNumberOfUsages: {
+      propDefinition: [
+        app,
+        "maxNumberOfUsages",
+      ],
+    },
   },
-  async additionalProps(existingProps) {
-    const props = {};
-    if (this.trigger === "Code") {
-      existingProps.code.hidden = false;
-      existingProps.code.disabled: false,
-    }
-    if (this.trigger === "Total") {
-      existingProps.totalToReach.hidden = false;
-      existingProps.totalToReach.disabled = false;
-    }
-    if (this.type === "FixedAmount") {
-      existingProps.amount.hidden = false;
-      existingProps.amount.disabled = false;
-    }
-    if (this.type === "Rate") {
-      existingProps.rate.hidden = false;
-      existingProps.rate.disabled = false;
-    }
-    return props;
+  async additionalProps(props) {
+    const triggerIsCode = this.trigger === "Code";
+    const triggerIsTotal = this.trigger === "Total";
+
+    props.code.hidden = !triggerIsCode;
+    props.code.optional = !triggerIsCode;
+    props.totalToReach.hidden = !triggerIsTotal;
+    props.totalToReach.optional = !triggerIsTotal;
+
+    const typeIsFixedAmount = this.type === "FixedAmount";
+    const typeIsRate = this.type === "Rate";
+
+    props.amount.hidden = !typeIsFixedAmount;
+    props.amount.optional = !typeIsFixedAmount;
+    props.rate.hidden = !typeIsRate;
+    props.rate.optional = !typeIsRate;
+
+    return {};
   },
   async run({ $ }) {
     const response = await this.app.createDiscount({
@@ -99,7 +98,6 @@ export default {
         type: this.type,
         amount: this.amount,
         rate: this.rate,
-        discount: this.discount,
       },
     });
 

components/snipcart/actions/update-discount/update-discount.mjs

@@ -19,106 +19,99 @@ export default {
         app,
         "name",
       ],
-    },
-    maxNumberOfUsages: {
-      propDefinition: [
-        app,
-        "maxNumberOfUsages",
-      ],
+      optional: true,
     },
     trigger: {
       propDefinition: [
         app,
         "trigger",
       ],
+      optional: true,
       reloadProps: true,
     },
     code: {
       propDefinition: [
         app,
         "code",
       ],
-      disabled: true,
+      optional: true,
       hidden: true,
     },
     totalToReach: {
       propDefinition: [
         app,
         "totalToReach",
       ],
-      disabled: true,
+      optional: true,
       hidden: true,
     },
     type: {
       propDefinition: [
         app,
         "type",
       ],
+      optional: true,
       reloadProps: true,
     },
     amount: {
       propDefinition: [
         app,
         "amount",
       ],
-      disabled: true,
+      optional: true,
       hidden: true,
     },
     rate: {
       propDefinition: [
         app,
         "rate",
       ],
-      disabled: true,
+      optional: true,
       hidden: true,
     },
+    maxNumberOfUsages: {
+      propDefinition: [
+        app,
+        "maxNumberOfUsages",
+      ],
+    },
   },
-  async additionalProps() {
-    const props = {};
-    if (this.trigger === "Code") {
-      props.code = {
-        type: "string",
-        label: "Code",
-        description: "Code for the discount",
-      };
-    }
-    if (this.trigger === "Total") {
-      props.totalToReach = {
-        type: "string",
-        label: "Total to Reach",
-        description: "Minimum amount required to activate the discount",
-      };
-    }
-    if (this.type === "FixedAmount") {
-      props.amount = {
-        type: "string",
-        label: "Amount",
-        description: "Discount amount. Required when discount type is `FixedAmount`",
-      };
-    }
-    if (this.type === "Rate") {
-      props.rate = {
-        type: "string",
-        label: "Rate",
-        description: "Discount percentage, i.e.: `10`. Required when discount type is `Rate`",
-      };
-    }
-    return props;
+  async additionalProps(props) {
+    const triggerIsCode = this.trigger === "Code";
+    const triggerIsTotal = this.trigger === "Total";
+
+    props.code.hidden = !triggerIsCode;
+    props.code.optional = !triggerIsCode;
+    props.totalToReach.hidden = !triggerIsTotal;
+    props.totalToReach.optional = !triggerIsTotal;
+
+    const typeIsFixedAmount = this.type === "FixedAmount";
+    const typeIsRate = this.type === "Rate";
+
+    props.amount.hidden = !typeIsFixedAmount;
+    props.amount.optional = !typeIsFixedAmount;
+    props.rate.hidden = !typeIsRate;
+    props.rate.optional = !typeIsRate;
+
+    return {};
   },
   async run({ $ }) {
+    const discount = await this.app.getDiscount({
+      $,
+      id: this.discountId,
+    });
     const response = await this.app.updateDiscount({
       $,
       id: this.discountId,
       data: {
-        name: this.name,
-        maxNumberOfUsages: this.maxNumberOfUsages,
-        trigger: this.trigger,
-        code: this.code,
-        totalToReach: this.totalToReach,
-        type: this.type,
-        amount: this.amount,
-        rate: this.rate,
-        discount: this.discount,
+        name: this.name || discount.name,
+        maxNumberOfUsages: this.maxNumberOfUsages || discount.maxNumberOfUsages,
+        trigger: this.trigger || discount.trigger,
+        code: this.code || discount.code,
+        totalToReach: this.totalToReach || discount.totalToReach,
+        type: this.type || discount.type,
+        amount: this.amount || discount.amount,
+        rate: this.rate || discount.rate,
       },
     });
 

components/snipcart/snipcart.app.mjs

@@ -26,14 +26,15 @@ export default {
       description: "Name of the discount",
     },
     maxNumberOfUsages: {
-      type: "string",
+      type: "integer",
       label: "Max Number of Usages",
-      description: "Maximum number of times the discount can be used",
+      description: "The maximum number of usage for the discount. If not specified, customers will be able to use this discount indefinitely.",
+      optional: true,
     },
     trigger: {
       type: "string",
       label: "Trigger",
-      description: "Trigger condition for the discount",
+      description: "Condition that will trigger the discount",
       options: constants.TRIGGER_OPTIONS,
     },
     code: {
@@ -49,7 +50,7 @@ export default {
     type: {
       type: "string",
       label: "Type",
-      description: "The type of action that the discount will apply",
+      description: "The type of action that the discount will apply to",
       options: constants.TYPE_OPTIONS,
     },
     amount: {
@@ -67,29 +68,37 @@ export default {
     _baseUrl() {
       return "https://app.snipcart.com/api";
     },
-    async _makeRequest(opts = {}) {
+    _makeRequest(opts = {}) {
       const {
         $ = this,
         path,
         ...otherOpts
       } = opts;
       return axios($, {
         ...otherOpts,
-        url: this._baseUrl() + path,
+        url: `${this._baseUrl()}${path}`,
         auth: {
           username: `${this.$auth.api_key}`,
           password: "",
         },
       });
     },
-    async createDiscount(args = {}) {
+    getDiscount({
+      id, ...args
+    }) {
+      return this._makeRequest({
+        path: `/discounts/${id}`,
+        ...args,
+      });
+    },
+    createDiscount(args = {}) {
       return this._makeRequest({
         method: "post",
         path: "/discounts",
         ...args,
       });
     },
-    async updateDiscount({
+    updateDiscount({
       id, ...args
     }) {
       return this._makeRequest({
@@ -98,7 +107,7 @@ export default {
         ...args,
       });
     },
-    async deleteDiscount({
+    deleteDiscount({
       id, ...args
     }) {
       return this._makeRequest({
@@ -107,17 +116,11 @@ export default {
         ...args,
       });
     },
-    async listDiscounts(args = {}) {
+    listDiscounts(args = {}) {
       return this._makeRequest({
         path: "/discounts",
         ...args,
       });
     },
-    async listProducts(args = {}) {
-      return this._makeRequest({
-        path: "/products",
-        ...args,
-      });
-    },
   },
 };