@lancom/shared 0.0.377 → 0.0.379

package/assets/js/utils/custom-validation-rules.js

@@ -3,11 +3,18 @@ const phoneValidators = {
   '+61': /^[0-9]{9,10}$/
 }
 
+// export const phone = {
+//   validate: (value, params) => {
+//     const [code] = params || [];
+//     const exp = phoneValidators[code] || /^[0-9-()\s+]+$/;
+//     return exp.test(`${value || ''}`);
+//   },
+//   message: 'Phone number is not valid'
+// };
+
 export const phone = {
-  validate: (value, params) => {
-    const [code] = params || [];
-    const exp = phoneValidators[code] || /^[0-9-()\s+]+$/;
-    return exp.test(`${value || ''}`);
+  validate: value => {
+    return /^[0-9-()\s+]+$/.test(`${value}`); // todo add validation for phone number
   },
   message: 'Phone number is not valid'
 };

package/components/checkout/cart/cart.mixin.js

@@ -15,6 +15,7 @@ export default {
     ...mapGetters(['shop', 'country', 'currency']),
     ...mapGetters('auth', ['user']),
     ...mapGetters('cart', [
+      'needToPickup',
       'entities',
       'cartPricing',
       'simpleProducts',
@@ -27,6 +28,17 @@ export default {
       'notValidStockQuantities',
       'notValidPrintsQuantities'
     ]),
+    wantsToPickup: {
+      get() {
+        return this.needToPickup;
+      },
+      set(needToPickup) {
+        if (needToPickup) {
+          this.setSuburb(null);
+        }
+        this.setNeedToPickup(needToPickup);
+      }
+    },
     isNotValidQuantity() {
       return this.isNotValidProductsQuantity || this.isNotValidStockQuantity || this.isNotValidPrintsQuantity || this.isNotValidPrintsBigSizeQuantity;
     },
@@ -45,17 +57,18 @@ export default {
   },
   watch: {
     entities() {
-      this.calculateCartPriceWithDebounce({ shop: this.shop, country: this.country });
+      this.calculateCartPriceWithDebounce({ shop: this.shop, country: this.country, currency: this.currency });
     }
   },
   mounted() {
-    this.calculateCartPriceWithDebounce({ shop: this.shop, country: this.country });
+    this.calculateCartPriceWithDebounce({ shop: this.shop, country: this.country, currency: this.currency });
     if (!this.suburb && this.user?.suburb) {
       this.handleSuburbChange(this.user.suburb);
     }
   },
   methods: {
     ...mapMutations('cart', [
+      'setNeedToPickup',
       'setSuburb',
       'setCoupon'
     ]),
@@ -63,8 +76,12 @@ export default {
       'removeSimpleProductsFromCart',
       'calculateCartPrice'
     ]),
+    recalculatePricing() {
+      this.calculateCartPriceWithDebounce({ shop: this.shop, country: this.country, currency: this.currency });
+    },
     handleSuburbChange(suburb) {
       this.setSuburb(suburb);
+      this.setNeedToPickup(false);
       this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
     },
     handleCouponChange(coupon) {

package/components/checkout/cart/cart.vue

@@ -36,7 +36,8 @@
               <checkbox
                 v-model="wantsToPickup"
                 :disabled="hasNotValidProductsPickup"
-                :dark="true">
+                :dark="true"
+                @change="recalculatePricing()">
                 <div class="ml-10 Cart__pickup-label">Wants to pickup</div>
               </checkbox>
             </div>
@@ -63,7 +64,7 @@
             <btn
               :btn-disabled="isNotValidQuantity || cartPricingError || cartPricingCalculating"
               :btn-block="true"
-              :to="needToPickup ? `/checkout/order?needToPickup=true` : '/checkout/order'"
+              :to="'/checkout/order'"
               btn-class="green"
               btn-label="PROCEED TO CHECKOUT">
               <i
@@ -113,15 +114,7 @@ export default {
   mixins: [CartMixin],
   computed: {
     ...mapGetters(['MESSAGES', 'SETTINGS', 'currency', 'country']),
-    ...mapGetters('cart', ['isEmpty', 'needToPickup', 'notValidProductsPickup','cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities']),
-    wantsToPickup: {
-      get() {
-        return this.needToPickup;
-      },
-      set(needToPickup) {
-        this.setNeedToPickup(needToPickup);
-      }
-    },
+    ...mapGetters('cart', ['isEmpty', 'notValidProductsPickup','cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities']),
     hasNotValidProductsPickup() {
       return this.notValidProductsPickup.length > 0;
     },
@@ -148,7 +141,6 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('cart', ['setNeedToPickup']),
     loadedPricing() {
       gtm.viewCart(this.entities, this.cartPricing, this.currency);
     }

package/components/checkout/order/order-billing-information/order-billing-information.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="OrderBillingInformation__wrapper">
     <div class="lc_h3 lc_uppercase lc_bold">
-      Delivery Address
+      {{ needToPickup ? 'Contact Info' : 'Delivery Address' }}
     </div>
     <div class="OrderBillingInformation__form">
       <validation-observer
@@ -10,8 +10,11 @@
         <div class="OrderBillingInformation__content">
           <address-form
             :address="order.shippingAddress"
+            :only-contact-info="needToPickup"
             :without-additional-info="true" />
-          <div class="mt-20 mb-20">
+          <div
+            v-if="!needToPickup"
+            class="mt-20 mb-20">
             <checkbox
               v-model="copyToBillingAddress"
               :dark="true">
@@ -74,11 +77,16 @@ export default {
   computed: {
     ...mapGetters(['currency'])
   },
+  mounted() {
+    if (this.needToPickup) {
+      this.copyToBillingAddress = false;
+    }
+  },
   methods: {
     async submit() {
       this.isSubmit = true;
 
-      const isValid = await this.$refs.form.validate() && !!this.order.shippingAddress.postcode;
+      const isValid = await this.$refs.form.validate() && (!!this.order.shippingAddress.postcode || this.needToPickup);
       if (!isValid) {
         return;
       }

package/components/common/postcode_select/postcode-select.vue

@@ -149,11 +149,17 @@ export default {
         return this.selected?._id ? this.selected : null;
       },
       set(option) {
-
         this.updatePostcode(option);
       }
     }
   },
+  watch: {
+    suburb() {
+      if (!this.suburb) {
+        this.selected = null;
+      }
+    }
+  },
   mounted() {
     if (this.suburb) {
       const option = this.createOptionFromSuburb(this.suburb);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.377",
+  "version": "0.0.379",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {

package/plugins/save-state.js

@@ -6,6 +6,8 @@ const SAVE_STATE_MODULES = new Map([
   ['cart/setId', 'cart.id'],
   ['cart/clearCart', 'cart.id'],
   ['cart/setCoupon', 'cart.coupon'],
+  ['cart/setNeedToPickup', 'cart.needToPickup'],
+  ['cart/setSuburb', 'cart.suburb'],
   ['cart/clearCart', 'cart.coupon']
 ]);
 

package/store/index.js

@@ -53,7 +53,7 @@ export const getters = {
 };
 
 export const actions = {
-  async nuxtServerInit({ commit }, { req, query }) {
+  async nuxtServerInit({ commit }, { req }) {
     const shop = await api.fetchShopByUrl(process.env.HOST_NAME);
     const menus = await api.fetchMenus(shop._id);
     commit('setMenus', menus);
@@ -98,10 +98,6 @@ export const actions = {
         }
       }
     } catch (e) {}
-
-    if (query?.needToPickup === 'true') {
-      commit('cart/setNeedToPickup', true);
-    }
   },
   async loadState({ dispatch, commit, state: { shop, currency, country, notificationBar } }, query) {
     const state = await loadState();
@@ -124,9 +120,8 @@ export const actions = {
         dispatch('cart/calculateCartPrice', { shop, country });
       }
     }
-    if (query.gclid || state?.googleClickId) {
-      commit('setGoogleClickId', query.gclid || state?.googleClickId);
-    }
+    commit('setGoogleClickId', query.gclid || state?.googleClickId || null);
+
     const closedNotification = localStorage.getItem(CLOSED_NOTIFICATION);
     if (notificationBar?.text === closedNotification) {
       commit('setNotificationBar', { ...notificationBar, enabled: false });