@lancom/shared 0.0.382 → 0.0.383

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

@@ -8,6 +8,7 @@ export default {
   ],
   data() {
     return {
+      visiblePickupError: false,
       calculateCartPriceWithDebounce: debounce(this.calculateCartPrice, 300)
     };
   },
@@ -16,6 +17,7 @@ export default {
     ...mapGetters('auth', ['user']),
     ...mapGetters('cart', [
       'needToPickup',
+      'needToPickupWithoutErrors',
       'entities',
       'cartPricing',
       'simpleProducts',
@@ -28,17 +30,6 @@ 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;
     },
@@ -81,7 +72,7 @@ export default {
     },
     handleSuburbChange(suburb) {
       this.setSuburb(suburb);
-      this.setNeedToPickup(false);
+      // this.setNeedToPickup(false);
       this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
     },
     handleCouponChange(coupon) {

package/components/checkout/cart/cart.vue

@@ -31,26 +31,6 @@
               :label-text="postcodeInfoLabel"
               @select="handleSuburbChange" />
           </div>
-          <div>
-            <div class="mt-20 mb-20">
-              <checkbox
-                v-model="wantsToPickup"
-                :disabled="hasNotValidProductsPickup"
-                :dark="true"
-                @change="recalculatePricing()">
-                <div class="ml-10 Cart__pickup-label">Wants to pickup</div>
-              </checkbox>
-            </div>
-            <div v-if="hasNotValidProductsPickup">
-              <ul class="Cart__pickup-errors">
-                <li
-                  v-for="product in notValidProductsPickup"
-                  :key="product._id">
-                  Not Available for pickup <b>{{ product.name }}. {{ product.size ? product.size.shortName : '' }}</b> order quantity: {{ product.amount }}. Available {{ product.warehouseQuantityStock }}
-                </li>
-              </ul>
-            </div>
-          </div>
           <div class="Cart__coupon-container">
             <coupon-select
               v-model="cartCoupon"
@@ -114,10 +94,7 @@ export default {
   mixins: [CartMixin],
   computed: {
     ...mapGetters(['MESSAGES', 'SETTINGS', 'currency', 'country']),
-    ...mapGetters('cart', ['isEmpty', 'notValidProductsPickup','cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities']),
-    hasNotValidProductsPickup() {
-      return this.notValidProductsPickup.length > 0;
-    },
+    ...mapGetters('cart', ['isEmpty','cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities']),
     onlyPostcode() {
       return !!this.SETTINGS.CART_ONLY_POSTCODE && this.country?.isoCode === 'UK';
     },

package/components/checkout/cart/cart_price_info/cart-price-info.scss

@@ -7,4 +7,15 @@
     color: $white;
     background-color: $error;
   }
+  &__pickup-label {
+    font-weight: 800;
+    font-size: 16px;
+    line-height: 22px;
+    text-transform: uppercase;
+    color: #303030;
+  }
+  &__pickup-errors {
+    color: $error;
+    font-size: 13px;
+  }
 }

package/components/checkout/cart/cart_price_info/cart-price-info.vue

@@ -10,6 +10,30 @@
       class="CartPriceInfo__error">
       {{ cartPricingError }}
     </div>
+    <div>
+      <div class="mt-20 mb-20">
+        <checkbox
+          v-model="wantsToPickup"
+          :dark="true"
+          @change="calculatePrice()">
+          <div class="ml-10 CartPriceInfo__pickup-label">
+            {{ contacts.warehousePickupInfo ? `Pickup from ${contacts.warehousePickupInfo}` : 'Wants to pickup' }}
+          </div>
+        </checkbox>
+      </div>
+      <div
+        v-if="hasNotValidProductsPickup"
+        class="CartPriceInfo__pickup-errors">
+        <div>Not all items in cart are available for pickup. Some items are available for delivery only</div>
+        <ul>
+          <li
+            v-for="product in notValidProductsPickup"
+            :key="product._id">
+            <b>{{ product.name }}. {{ product.size ? product.size.shortName : '' }}</b> order quantity: {{ product.amount }}. Available {{ product.warehouseQuantityStock }}
+          </li>
+        </ul>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -19,7 +43,7 @@ import debounce from 'lodash.debounce';
 import CartPricing from '@lancom/shared/components/checkout/cart/cart_pricing/cart-pricing';
 import { price } from '@lancom/shared/assets/js/utils/filters';
 
-const { mapActions } = createNamespacedHelpers('cart');
+const { mapActions, mapMutations } = createNamespacedHelpers('cart');
 
 export default {
   name: 'LancomCartPriceInfo',
@@ -35,17 +59,39 @@ export default {
   },
   data() {
     return {
+      visiblePickupError: null,
       price: null,
       calculatePriceWithDebounce: debounce(this.calculatePrice, 500)
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country', 'currency']),
+    ...mapGetters(['shop', 'country', 'currency', 'contacts']),
     ...mapGetters('cart', [
+      'notValidProductsPickup',
+      'needToPickup',
+      'needToPickupWithoutErrors',
       'entities',
       'cartPricing',
       'cartPricingError'
-    ])
+    ]),
+    hasNotValidProductsPickup() {
+      return this.notValidProductsPickup.length > 0;
+    },
+    wantsToPickup: {
+      get() {
+        return this.needToPickup;
+      },
+      set(needToPickup) {
+        if (needToPickup && this.hasNotValidProductsPickup) {
+          this.visiblePickupError = true;
+        } else {
+          // if (needToPickup) {
+          //   this.setSuburb(null);
+          // }
+          this.setNeedToPickup(needToPickup);
+        }
+      }
+    }
   },
   watch: {
     entities() {
@@ -57,6 +103,10 @@ export default {
     this.$emit('loaded', this.cartPricing);
   },
   methods: {
+    ...mapMutations([
+      'setSuburb',
+      'setNeedToPickup'
+    ]),
     ...mapActions([
       'calculateCartPrice'
     ]),

package/components/checkout/cart/cart_shipments_pricing/cart-shipments-pricing.vue

@@ -33,7 +33,7 @@
           :class="{
             'CartShipmentsPricing__rate--disabled': rate.disabled
           }"
-          @click="selectRate({ supplier, rate, shop, country, currency })">
+          @click="!rate.selected && selectRate({ supplier, rate, shop, country, currency })">
           <div class="CartShipmentsPricing__rate-info">
             <div class="CartShipmentsPricing__rate-icon">
               <checked-icon :checked="rate.selected" />

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">
-      {{ needToPickup ? 'Contact Info' : 'Delivery Address' }}
+      {{ needToPickupWithoutErrors ? 'Contact Info' : 'Delivery Address' }}
     </div>
     <div class="OrderBillingInformation__form">
       <validation-observer
@@ -10,10 +10,10 @@
         <div class="OrderBillingInformation__content">
           <address-form
             :address="order.shippingAddress"
-            :only-contact-info="needToPickup"
+            :only-contact-info="needToPickupWithoutErrors"
             :without-additional-info="true" />
           <div
-            v-if="!needToPickup"
+            v-if="!needToPickupWithoutErrors"
             class="mt-20 mb-20">
             <checkbox
               v-model="copyToBillingAddress"
@@ -78,7 +78,7 @@ export default {
     ...mapGetters(['currency'])
   },
   mounted() {
-    if (this.needToPickup) {
+    if (this.needToPickupWithoutErrors) {
       this.copyToBillingAddress = false;
     }
   },
@@ -86,7 +86,7 @@ export default {
     async submit() {
       this.isSubmit = true;
 
-      const isValid = await this.$refs.form.validate() && (!!this.order.shippingAddress.postcode || this.needToPickup);
+      const isValid = await this.$refs.form.validate() && (!!this.order.shippingAddress.postcode || this.needToPickupWithoutErrors);
       if (!isValid) {
         return;
       }

package/package.json

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

package/store/cart.js

@@ -76,6 +76,7 @@ export const getters = {
   entities: ({ entities }) => entities,
   coupon: ({ coupon }) => coupon,
   needToPickup: ({ needToPickup }) => needToPickup,
+  needToPickupWithoutErrors: (state, { notValidProductsPickup }) => state.needToPickup && notValidProductsPickup?.length === 0,
   cartPricingCalculating: ({ cartPricingCalculating }) => cartPricingCalculating,
   simpleProducts: ({ entities }) => entities.reduce((simpleProducts, entity) => [...simpleProducts, ...(entity.simpleProducts || [])], []),
   notEmptySimpleProducts: (state, { simpleProducts }) => simpleProducts.filter(e => e.amount > 0),
@@ -189,7 +190,7 @@ export const actions = {
     await api.saveCart(payload, shop._id);
     commit('setEntities', entities);
   },
-  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing, needToPickup }, commit }, { shop, country, currency }) {
+  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, getters: { needToPickupWithoutErrors }, commit }, { shop, country, currency }) {
     let savedSuppliersWithRates = null;
     try {
       savedSuppliersWithRates = JSON.parse(localStorage.getItem(SUPPLIERS_WITH_RATES_KEY));
@@ -199,7 +200,7 @@ export const actions = {
     console.log('calculateCartPrice:payload: ', payload)
     try {
       commit('setCartPricingCalculating', true);
-      const response = await api.calculateProductPrice({ ...payload, needToPickup }, shop._id);
+      const response = await api.calculateProductPrice({ ...payload, needToPickup: needToPickupWithoutErrors }, shop._id);
       commit('setCartPricing', response);
       commit('setCartPricingError', null);
     } catch (e) {