@ecomplus/storefront-components 1.0.0-beta.174 → 1.0.0-beta.176

package/package.json

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

package/src/js/ShippingCalculator.js

@@ -19,6 +19,7 @@ import ShippingLine from '../ShippingLine.vue'
 
 const localStorage = typeof window === 'object' && window.localStorage
 const zipStorageKey = 'shipping-to-zip'
+const globalOpts = (typeof window === 'object' && window.propsShippingCalculator) || {}
 
 const reduceItemBody = itemOrProduct => {
   const shippedItem = {}
@@ -54,9 +55,17 @@ export default {
   props: {
     zipCode: String,
     canSelectServices: Boolean,
+    canAutoSelectService: {
+      type: Boolean,
+      default: typeof globalOpts.canAutoSelectService === 'boolean'
+        ? globalOpts.canAutoSelectService
+        : true
+    },
     canInputZip: {
       type: Boolean,
-      default: true
+      default: typeof globalOpts.canInputZip === 'boolean'
+        ? globalOpts.canInputZip
+        : true
     },
     countryCode: {
       type: String,
@@ -193,7 +202,9 @@ export default {
                   ? -1
                   : 1
           })
-          this.setSelectedService(0)
+          if (this.canAutoSelectService) {
+            this.setSelectedService(0)
+          }
           this.hasPaidOption = Boolean(this.shippingServices.find(service => {
             return service.shipping_line.total_price || service.shipping_line.price
           }))

package/src/js/ShippingLine.js

@@ -14,6 +14,8 @@ import {
   formatMoney
 } from '@ecomplus/utils'
 
+const globalOpts = (typeof window === 'object' && window.propsShippingLine) || {}
+
 export default {
   name: 'ShippingLine',
 
@@ -25,6 +27,10 @@ export default {
     productionDeadline: {
       type: Number,
       default: 0
+    },
+    getDeadlineStr: {
+      type: Function,
+      default: globalOpts.getDeadlineStr
     }
   },
 
@@ -38,6 +44,14 @@ export default {
         days += shipping.delivery_time.days
       }
       days += this.productionDeadline
+      if (this.getDeadlineStr) {
+        const str = this.getDeadlineStr({
+          days,
+          isWorkingDays,
+          shippingLine: this.shippingLine
+        })
+        if (str) return str
+      }
       if (days > 1) {
         return `${i18n(i19upTo)} ${days} ` +
           i18n(isWorkingDays ? i19workingDays : i19days).toLowerCase()

package/src/js/TheAccount.js

@@ -40,6 +40,12 @@ export default {
         return ['orders', 'favorites', 'subscriptions', 'points', 'account'].includes(value)
       }
     },
+    isExternalAuth: {
+      type: Boolean,
+      default () {
+        return Boolean(window.$firebaseConfig && window.$firebaseConfig.authDomain)
+      }
+    },
     ecomPassport: {
       type: Object,
       default () {
@@ -143,6 +149,10 @@ export default {
   },
 
   created () {
+    if (this.isExternalAuth && !this.ecomPassport.checkAuthorization()) {
+      window.location.href = '/app/account'
+      return
+    }
     this.navTabs = [
       {
         label: this.i19registration,

package/src/scss/ShippingLine.scss

@@ -18,3 +18,7 @@
     color: var(--text-muted);
   }
 }
+
+.active .shipping-line > small {
+  color: inherit;
+}