@ecomplus/storefront-components 1.0.0-beta.183 → 1.0.0-beta.185

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecomplus/storefront-components",
-  "version": "1.0.0-beta.183",
+  "version": "1.0.0-beta.185",
   "description": "Vue components for E-Com Plus Storefront",
   "main": "dist/storefront-components.min.js",
   "scripts": {
@@ -39,7 +39,7 @@
     "@ecomplus/search-engine": "^2.6.1",
     "@ecomplus/shopping-cart": "^2.6.0",
     "@ecomplus/storefront-twbs": "^7.3.6",
-    "@glidejs/glide": "^3.6.2",
+    "@glidejs/glide": "^3.7.1",
     "@linusborg/vue-simple-portal": "^0.1.5",
     "axios": "^0.27.2 || ^1.1.2",
     "cleave.js": "^1.6.0",

package/src/js/DiscountApplier.js

@@ -156,6 +156,7 @@ export default {
 
     parseDiscountOptions (listResult = []) {
       let extraDiscountValue = 0
+      let hasFreebies = false
       if (listResult.length) {
         let discountRule, invalidCouponMsg, invalidAlertVariant
         listResult.forEach(appResult => {
@@ -193,7 +194,14 @@ export default {
               invalidCouponMsg = response.invalid_coupon_message
             }
             if (this.canAddFreebieItems) {
-              addFreebieItems(this.ecomCart, response.freebie_product_ids)
+              const freebieProductIds = response.freebie_product_ids
+              if (Array.isArray(freebieProductIds) && freebieProductIds.length) {
+                hasFreebies = true
+                addFreebieItems(this.ecomCart, freebieProductIds)
+                if (this.localCouponCode) {
+                  this.$emit('update:coupon-code', this.localCouponCode)
+                }
+              }
             }
           }
         })
@@ -213,7 +221,7 @@ export default {
           }
           this.$emit('set-discount-rule', discountRule)
         } else {
-          if (this.localCouponCode) {
+          if (this.localCouponCode && !hasFreebies) {
             this.alertText = invalidCouponMsg || this.i19invalidCouponMsg
             this.alertVariant = invalidAlertVariant || 'warning'
           } else {

package/src/js/LoginBlock.js

@@ -167,7 +167,7 @@ export default {
       .then(({ host, baseUri, oauthPath, providers }) => {
         const oauthProviders = []
         for (const provider in providers) {
-          if (providers[provider]) {
+          if (providers[provider] && provider !== 'facebook') {
             const { faIcon, providerName } = providers[provider]
             let link = host + baseUri + provider + oauthPath
             const referral = typeof window === 'object' &&

package/src/js/LoginModal.js

@@ -125,7 +125,7 @@ export default {
         .then(({ host, baseUri, oauthPath, providers }) => {
           const oauthProviders = []
           for (const provider in providers) {
-            if (providers[provider]) {
+            if (providers[provider] && provider !== 'facebook') {
               const { faIcon, providerName } = providers[provider]
               let link = host + baseUri + provider + oauthPath
               const referral = typeof window === 'object' &&
@@ -153,11 +153,6 @@ export default {
 
     presetOauthProviders () {
       this.oauthProviders = [
-        {
-          faIcon: 'fa-facebook-f',
-          providerName: 'Facebook',
-          provider: 'facebook'
-        },
         {
           faIcon: 'fa-google',
           providerName: 'Google',