@lancom/shared 0.0.443 → 0.0.445

package/components/checkout/cart/cart.vue

@@ -50,7 +50,9 @@
             </checkbox>
           </div>
 
-          <div class="mt-10">
+          <div
+            v-tooltip="isNotValidShipping ? 'To proceed, enter your postcode to calculate shipping' : ''"
+            class="mt-10">
             <btn
               :btn-disabled="isCheckoutDisabled"
               :btn-block="true"

package/components/checkout/cart/cart_shipping/cart-shipping.vue

@@ -129,6 +129,9 @@ export default {
     if (this.wantsToPickup && this.hasNotValidProductsPickup) {
       this.visiblePickupError = true;
     }
+    if (!this.suburb && this.SETTINGS.DEFAULT_POSTCODE) {
+      this.setSuburb({ postcode: this.SETTINGS.DEFAULT_POSTCODE });
+    }
   },
   methods: {
     ...mapActions([

package/components/common/number_input/number-input.vue

@@ -39,11 +39,6 @@ import { generateGUID } from '@lancom/shared/assets/js/utils/guid';
 
 export default {
   name: 'NumberInput',
-  data() {
-    return {
-      uniqueCode: generateGUID()
-    };
-  },
   props: {
     id: {
       type: String
@@ -77,6 +72,11 @@ export default {
       default: false
     }
   },
+  data() {
+    return {
+      uniqueCode: generateGUID()
+    };
+  },
   computed: {
     model: {
       get() {

package/components/product/editor_pricing/editor-pricing.scss

@@ -27,6 +27,13 @@
       }
     }
   }
+  &__clearance-message {
+    padding: 10px;
+    text-align: center;
+    border-top: 1px solid #E5E5E5;
+    font-size: 13px;
+    color: #0b7d2f;
+  }
   &__footer {
     background: $green;
     height: 76px;

package/components/product/editor_pricing/editor-pricing.vue

@@ -69,7 +69,16 @@
           {{ hasPrintIssues ? 'Proceed with order, Will be in touch regarding print issue' : 'All good to go!' }}
         </div>
       </div>
-
+      <div
+        v-if="product.isClearance"
+        class="EditorPricing__clearance-message">
+        Product is non-returnable clearance product
+      </div>
+      <div
+        v-if="clearanceColorsWithQty.length"
+        class="EditorPricing__clearance-message">
+        {{ clearanceColorsWithQty.length > 1 ? 'Colours' : 'Colour' }}: {{ clearanceColorsText }} {{ clearanceColorsWithQty.length > 1 ? 'are' : 'is' }} non-returnable clearance {{ clearanceColorsWithQty.length > 1 ? 'colours' : 'colour' }}
+      </div>
       <div
         v-if="hasPricing"
         class="EditorPricing__footer">
@@ -162,7 +171,8 @@ export default {
       'multipack',
       'offsetWarningVisible',
       'showRecommendationToUseLargerImage',
-      'showErrorAboutSmallImage'
+      'showErrorAboutSmallImage',
+      'availableColors'
     ]),
     hasPrintIssues() {
       return this.offsetWarningVisible || this.showRecommendationToUseLargerImage || this.showErrorAboutSmallImage;
@@ -173,6 +183,19 @@ export default {
     totalPrice() {
       const { totalPriceWithoutTax, totalPrice } = this.productPricing;
       return this.priceIncludeGST ? totalPrice : totalPriceWithoutTax;
+    },
+    clearanceColors() {
+      return this.availableColors?.filter(color => this.product.colorsPricing?.some(c => c.colors?.includes(color._id) && c.clearance)) || [];
+    },
+    clearanceColorsWithQty() {
+      console.log('clearanceColors: ', this.clearanceColors);
+      return this.clearanceColors.map(color => {
+        const qty = this.usedSimpleProducts.reduce((sum, sp) => sp.color._id === color._id ? sum + (sp.amount || 0) : sum, 0);
+        return qty > 0 ? { ...color, qty } : null;
+      }).filter(c => c);
+    },
+    clearanceColorsText() {
+      return this.clearanceColorsWithQty.map(c => `${c.name}`).join(', ');
     }
   },
   watch: {

package/components/product/layouts/product_colors_selector/product_colors_selector_options/product-colors-selector-options.vue

@@ -3,13 +3,12 @@
     <div
       v-for="color in availableColors"
       :key="color._id"
-      v-tooltip="color.name"
+      v-tooltip="(product.isClearance || isClearanceColor(color)) ? `${color.name}. Clearance - non returnable` : color.name"
       class="ProductColorsSelectorOptions__color"
       :class="{ selected: editableColor === color }"
       @click="toggleSelection(color)">
       <i
         v-if="product.isClearance || isClearanceColor(color)"
-        v-tooltip="'Clearance'"
         class="icon-percent"></i>
       <product-color-image
         :color="color"

package/components/product/product_check_delivery/product-check-delivery.vue

@@ -16,7 +16,7 @@
       <postcode-select
         v-model="suburb.postcode"
         :suburb="suburb"
-        :only-postcode="true"
+        :only-postcode="false"
         label-text="Postcode"
         @select="onSelectSuburb" />
     </div>
@@ -94,10 +94,14 @@ export default {
       return totalPriceWithoutTax;
     }
   },
+  props: {
+    value: {
+      type: Object
+    }
+  },
   data() {
-    const postcode = 'SW1A 1AA';
     return {
-      suburb: { postcode },
+      suburb: null,
       pricing: null,
       calculating: false,
       recalcNeeded: false,
@@ -105,10 +109,10 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country', 'currency']),
-    ...mapGetters('product', ['product', 'usedSimpleProducts', 'template']),
+    ...mapGetters(['shop', 'country', 'currency', 'SETTINGS']),
+    ...mapGetters('product', ['product', 'usedSimpleProducts', 'template', 'defaultSimpleProduct']),
     hasSelection() {
-      return (this.usedSimpleProducts || []).length > 0;
+      return (this.usedSimpleProducts || []).length > 0 || this.value;
     },
     hasSuppliersWithRates() {
       return this.suppliersWithRates.length > 0;
@@ -128,13 +132,21 @@ export default {
             this.calculateShipping();
           }
         }
+        this.$emit('input', null);
       },
       deep: true
+    },
+    value() {
+      if (this.pricing) {
+        this.recalcNeeded = true;
+      } else {
+        this.calculateShipping();
+      }
     }
   },
-  mounted() {
-    if (this.hasSelection) {
-      this.calculateShipping();
+  created() {
+    if (this.SETTINGS.DEFAULT_POSTCODE) {
+      this.suburb = { postcode: this.SETTINGS.DEFAULT_POSTCODE };
     }
   },
   methods: {
@@ -154,7 +166,18 @@ export default {
       this.calculating = true;
       this.recalcNeeded = false;
       try {
-        const entities = getProductsForCalculatePricing(this.product, this.usedSimpleProducts);
+        let usedSimpleProducts = this.usedSimpleProducts;
+        if (this.value) {
+          if (this.value?.color) {
+            usedSimpleProducts = usedSimpleProducts.filter(c => c.color._id === this.value?.color?._id);
+          }
+          if (this.value?.size) {
+            usedSimpleProducts = usedSimpleProducts.filter(c => c.size._id === this.value?.size?._id);
+          }
+          const simpleProduct = usedSimpleProducts[0] || this.usedSimpleProducts[0] || this.defaultSimpleProduct;
+          usedSimpleProducts = simpleProduct ? [{ ...simpleProduct, amount: simpleProduct.amount || 1 }] : [];
+        }
+        const entities = getProductsForCalculatePricing(this.product, usedSimpleProducts);
         const payload = {
           entities: entities.map(e => ({ ...e, brand: this.product.brand })),
           postcode: this.suburb?.postcode,

package/components/product/products_size_selector_color/product_size_selector_color/product-size-selector-color.vue

@@ -169,10 +169,10 @@ export default {
       const amount = this.usedSimpleProductsQuantity;
       const pricing = this.pricing;
       const price = (pricing.find(({ min, max }) => (!min || min <= amount) && (!max || max >= amount)) || pricing[0] || {}).price || 0;
-      return this.withGst ? tax(price, this.gstTax) : price;
+      return +(this.withGst ? tax(price, this.gstTax) : price);
     },
     productPrintsPrice() {
-      return this.withGst ? tax(this.printsPrice, this.gstTax) : this.printsPrice;
+      return +(this.withGst ? tax(this.printsPrice, this.gstTax) : this.printsPrice);
     },
     disabled() {
       return !this.product.quantityStock || !this.productPrice;

package/feeds/google-shopping.js

@@ -102,10 +102,14 @@ async function googleShoppingFeed(axios, config, availableStores, country, isEdi
                 info['g:gtin'] = { _text: sp.gtin || '' };
               }
 
-              if (sp.clearancePrice > 0 || product.isClearance) {
+              const isClearance = sp.clearancePrice > 0 || product.isClearance;
+
+              if (isClearance && sp.clearancePrice !== sp.price) {
                 info['g:sale_price'] = { _text: `${(sp.clearancePrice)} ${sp.currencyCode || 'AUD'}` };
               }
 
+              info['g:return_policy_label'] = { _text: isClearance ? 'clearance' : '' };
+
               if (!config.IGNORE_STORE_CODE) {
                 if (sp.storeCode) {
                   info['g:store_code'] = { _text: sp.storeCode };

package/package.json

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

package/plugins/save-state.js

@@ -1,6 +1,6 @@
 import debounce from 'lodash.debounce';
 
-const STATE_STORAGE_KEY = 'lancom-state-2.2';
+const STATE_STORAGE_KEY = 'lancom-state-2.3';
 const SAVE_STATE_MODULES = new Map([
   ['setGoogleClickId', 'googleClickId'],
   ['cart/setId', 'cart.id'],