@lancom/shared 0.0.447 → 0.0.448

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart-entity-color-simple-products.mixin.js

@@ -2,6 +2,8 @@ import { mapGetters } from 'vuex';
 import ImageViewer from '@lancom/shared/components/common/image_viewer/image-viewer';
 import { staticLink } from '@lancom/shared/assets/js/utils/filters';
 import { getProductColorImages } from '@lancom/shared/assets/js/utils/product';
+import { isValidImageType } from '@lancom/shared/assets/js/utils/colors';
+import { COLORS_IMAGES_TYPES } from '@lancom/shared/assets/js/constants/colors';
 
 export default {
   props: {
@@ -40,6 +42,12 @@ export default {
     images() {
       return getProductColorImages(this.group, this.group.color);
     },
+    hasFrontImage() {
+      return this.images.some(image => isValidImageType(image, COLORS_IMAGES_TYPES.FRONT));
+    },
+    hasBackImage() {
+      return this.images.some(image => isValidImageType(image, COLORS_IMAGES_TYPES.BACK));
+    },
     product() {
       return this.group.product;
     },
@@ -59,7 +67,7 @@ export default {
       }, 0);
     },
     simpleProductWithInvalidStock() {
-      return this.simpleProductsWithAmount.filter(({ amount, quantityStock }) => amount > quantityStock)
+      return this.simpleProductsWithAmount.filter(({ amount, quantityStock }) => amount > quantityStock);
     }
   },
   methods: {

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart-entity-color-simple-products.vue

@@ -7,6 +7,7 @@
     </div>
     <div class="CartEntityColorSimpleProducts__image-wrapper">
       <div
+        v-if="hasFrontImage"
         class="CartEntityColorSimpleProducts__image"
         @click="showImage(images, 0)">
         <product-side-with-print
@@ -17,7 +18,7 @@
           size="medium" />
       </div>
       <div
-        v-if="entity && entity.printsThumbnails && entity.printsThumbnails.back"
+        v-if="entity && entity.printsThumbnails && entity.printsThumbnails.back && hasBackImage"
         class="CartEntityColorSimpleProducts__image"
         @click="showImage(images, 1)">
         <product-side-with-print

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

@@ -46,7 +46,7 @@
               <div>{{ rate.name }}</div>
               <div
                 v-if="rate.note"
-                class="lc_regular10">
+                class="lc_regular12">
                 {{ rate.note }}
               </div>
             </div>

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

@@ -30,7 +30,7 @@
       <div
         v-if="!isAvailableForPickupSomeProducts"
         class="CartShipping__pickup-warnings">
-        Pickup only available for "Code Red" brand
+        Pickup only available for "{{ pickupBrand }}" brand
       </div>
       <div
         v-if="visiblePickupError && hasNotValidProductsPickup"
@@ -84,6 +84,9 @@ export default {
       'cartPricing',
       'cartPricingError'
     ]),
+    pickupBrand() {
+      return this.SETTINGS.DEFAULT_PICKUP_BRAND || 'Code Red';
+    },
     postcodeInfoLabel() {
       return this.MESSAGES.CART_POSTCODE_INFO || 'Enter postcode to calculate shipping';
     },

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

@@ -27,12 +27,25 @@
       }
     }
   }
-  &__clearance-message {
+  &__clearance-messages {
     padding: 10px;
     text-align: center;
     border-top: 1px solid #E5E5E5;
-    font-size: 13px;
-    color: #0b7d2f;
+  }
+  &__clearance-message {
+    background-color: #fff3cd;
+    color: #856404;
+    border: 1px solid #ffeaa7;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 20px;
+    padding: 4px 12px;
+    text-align: center;
+    border-radius: 4px;
+    margin-top: 5px;
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
   }
   &__footer {
     background: $green;

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

@@ -70,14 +70,18 @@
         </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' }}
+        v-if="product.isClearance || clearanceColorsWithQty.length > 0"
+        class="EditorPricing__clearance-messages">
+        <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>
       <div
         v-if="hasPricing"

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

@@ -55,7 +55,7 @@
               <div>{{ rate.name }}</div>
               <div
                 v-if="rate.note"
-                class="lc_regular10">
+                class="lc_regular12">
                 {{ rate.note }}
               </div>
             </div>
@@ -125,7 +125,7 @@ export default {
     usedSimpleProducts: {
       handler() {
         const currentSignature = this.buildSignature();
-        if (this.hasSelection && currentSignature !== this.lastUsedSimpleProductsSignature) {
+        if (this.hasSelection && currentSignature !== this.lastUsedSimpleProductsSignature && this.currentSignature.length) {
           if (this.pricing) {
             this.recalcNeeded = true;
           } else {
@@ -138,7 +138,9 @@ export default {
     },
     value() {
       if (this.pricing) {
-        this.recalcNeeded = true;
+        if (this.value?.size && this.value?.quantity) {
+          this.recalcNeeded = true;
+        }
       } else {
         this.calculateShipping();
       }
@@ -186,7 +188,6 @@ export default {
           currency: this.currency?._id
         };
         this.pricing = await api.calculateProductPrice(payload, this.shop._id);
-        this.lastUsedSimpleProductsSignature = this.buildSignature(usedSimpleProducts);
       } catch (e) {
         this.pricing = null;
       } finally {

package/feeds/google-shopping.js

@@ -135,8 +135,8 @@ async function googleShoppingFeed(axios, config, availableStores, country, isEdi
                 }
               }
 
-              if (product.country) {
-                info['g:shipping_label'] = product.country;
+              if (product.country || sp.shippingLabel) {
+                info['g:shipping_label'] = sp.shippingLabel || product.country;
               }
 
               if (allowSameDayDelivery && product.sameDayDelivery) {

package/package.json

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