@ecomplus/storefront-components 1.0.0-beta.180 → 1.0.0-beta.182

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecomplus/storefront-components",
-  "version": "1.0.0-beta.180",
+  "version": "1.0.0-beta.182",
   "description": "Vue components for E-Com Plus Storefront",
   "main": "dist/storefront-components.min.js",
   "scripts": {

package/src/html/DiscountApplier.html

@@ -87,7 +87,7 @@
   </template>
 
   <a-alert
-    :key="`alert-${alertVariant}`"
+    :key="`alert-${alertVariant}-${localCouponCode}`"
     :can-show="!isLoading && Boolean(alertText)"
     :variant="alertVariant"
     @dismiss="alertText = null"

package/src/html/ShippingCalculator.html

@@ -55,7 +55,8 @@
           leave-active-class="animated fadeOutDown"
         >
           <div
-            v-if="canSelectServices && !canAutoSelectService && selectedService === null"
+            v-if="canSelectServices && !canAutoSelectService &&
+              selectedService === null && shippingServices.length"
             class="shipping-calculator__label"
           >
             <i class="i-arrow-down animated wobble"></i>

package/src/js/CartQuickview.js

@@ -95,7 +95,7 @@ export default {
       this.selectedShippingPrice = service.shipping_line
         ? service.shipping_line.total_price
         : 0
-    },
+    }
   },
 
   created () {

package/src/js/DiscountApplier.js

@@ -80,6 +80,7 @@ export default {
       default: true
     },
     modulesPayload: Object,
+    paymentGateway: Object,
     ecomCart: {
       type: Object,
       default () {
@@ -125,6 +126,22 @@ export default {
     canAddCoupon () {
       return !this.couponCode || !this.isCouponApplied ||
         this.couponCode !== this.localCouponCode
+    },
+
+    paymentGatewayDiscount () {
+      if (!this.paymentGateway) return 0
+      const { discount } = this.paymentGateway
+      if (!discount || !discount.value) return 0
+      const applyAt = discount.apply_at || 'total'
+      const maxDiscount = applyAt === 'total' ? this.localAmountTotal : this.amount[applyAt]
+      if (maxDiscount > 0) {
+        const { type, value } = discount
+        if (type === 'percentage') {
+          return maxDiscount * value / 100
+        }
+        return value <= maxDiscount ? value : maxDiscount
+      }
+      return 0
     }
   },
 
@@ -133,7 +150,8 @@ export default {
       const amount = this.amount || {
         subtotal: this.ecomCart.data.subtotal
       }
-      this.localAmountTotal = (amount.subtotal || 0) + (amount.freight || 0)
+      this.localAmountTotal = (amount.subtotal || 0) +
+        (amount.freight || 0) - this.paymentGatewayDiscount
     },
 
     parseDiscountOptions (listResult = []) {
@@ -230,7 +248,7 @@ export default {
             subtotal: this.localAmountTotal,
             ...this.amount,
             total: this.localAmountTotal,
-            discount: 0
+            discount: this.paymentGatewayDiscount
           },
           items: this.ecomCart.data.items,
           ...data
@@ -268,12 +286,23 @@ export default {
       ) {
         this.fetchDiscountOptions()
       }
+    },
+
+    scheduleUpdateDiscount () {
+      if (this.isUpdateSheduled) return
+      this.isUpdateSheduled = true
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.updateDiscount()
+          this.isUpdateSheduled = false
+        }, 600)
+      })
     }
   },
 
   watch: {
     couponCode (couponCode) {
-      if (couponCode !== this.couponCode) {
+      if (couponCode !== this.localCouponCode) {
         this.localCouponCode = couponCode
         if (couponCode && !this.isFormVisible) {
           this.isFormVisible = true
@@ -281,6 +310,12 @@ export default {
       }
     },
 
+    localCouponCode () {
+      if (this.alertVariant === 'info') {
+        this.alertText = null
+      }
+    },
+
     isFormAlwaysVisible (isFormVisible) {
       if (isFormVisible) {
         this.isFormVisible = true
@@ -296,14 +331,8 @@ export default {
     },
 
     localAmountTotal (total, oldTotal) {
-      if (oldTotal !== null && Math.abs(total - oldTotal) > 0.01 && !this.isUpdateSheduled) {
-        this.isUpdateSheduled = true
-        this.$nextTick(() => {
-          setTimeout(() => {
-            this.updateDiscount()
-            this.isUpdateSheduled = false
-          }, 600)
-        })
+      if (oldTotal !== null && Math.abs(total - oldTotal) > 0.01) {
+        this.scheduleUpdateDiscount()
       }
     },
 
@@ -312,6 +341,10 @@ export default {
         this.fixAmount()
       },
       deep: true
+    },
+
+    paymentGatewayDiscount () {
+      this.scheduleUpdateDiscount()
     }
   },
 

package/src/js/ShippingCalculator.js

@@ -208,6 +208,8 @@ export default {
           })
           if (this.canAutoSelectService) {
             this.setSelectedService(0)
+          } else {
+            this.selectedService = null
           }
           this.hasPaidOption = Boolean(this.shippingServices.find(service => {
             return service.shipping_line.total_price || service.shipping_line.price