@lancom/shared 0.0.352 → 0.0.354

package/assets/js/utils/fonts-helper.js

@@ -65,7 +65,8 @@ export const getFormattedFont = alias => {
 export const getFontPath = alias => {
   const { PROD_CDN_URL, DEV_CDN_URL, CDN_DOMAIN } = Vue.$env;
   const { path } = getFont(alias) || {};
-  return path && staticLink(`${CDN_DOMAIN || PROD_CDN_URL || DEV_CDN_URL || ''}${path}`);
+  const domain = process.env.IS_LOCAL ? '' : (CDN_DOMAIN || PROD_CDN_URL || DEV_CDN_URL || '');
+  return path && staticLink(`${domain}${path}`);
 };
 
 export const loadFont = alias => new Promise((resolve, reject) => {

package/assets/js/utils/product.js

@@ -110,10 +110,12 @@ function getCategoryPathFromRoute(routeParams) {
 }
 
 export function generateProductsLink($route, data, skipParams = false) {
-  let { type, category, brand, text, sort } = data;
+  let { type, category, brand, text, sort, minimumQty, productionTime } = data;
   category = (category || category === null) ? generateCategoryPath(category) : getCategoryPathFromRoute($route?.params);
   type = (type || type === null) ? type : ($route?.params?.type || $route?.query?.type);
   brand = (brand || brand === null) ? brand : ($route?.params?.brand || $route?.query?.brand);
+  minimumQty = (minimumQty || minimumQty === null) ? minimumQty : ($route?.params?.minimumQty || $route?.query?.minimumQty);
+  productionTime = (productionTime || productionTime === null) ? productionTime : ($route?.params?.productionTime || $route?.query?.productionTime);
   text = (text || text === '') ? text : $route?.query?.text;
   sort = (sort || sort === '') ? sort : $route?.query?.sort;
 
@@ -125,6 +127,12 @@ export function generateProductsLink($route, data, skipParams = false) {
   if (sort) {
     params.push(`sort=${sort}`);
   }
+  if (minimumQty) {
+    params.push(`minimumQty=${minimumQty}`);
+  }
+  if (productionTime) {
+    params.push(`productionTime=${productionTime}`);
+  }
 
   const { page = 1 } = data;
   if (page > 1) {
@@ -132,7 +140,7 @@ export function generateProductsLink($route, data, skipParams = false) {
   }
 
   Object.keys({ ...(($route && $route.query) || {}), ...data }).forEach(key => {
-    const rootKeys = ['text', 'sort', 'page', 'category', 'type', 'brand'];
+    const rootKeys = ['text', 'sort', 'page', 'category', 'type', 'brand', 'minimumQty', 'productionTime'];
     if (!rootKeys.includes(key)) {
       let items = ($route && $route.query[key]) ? $route.query[key].split(',') : [];
       items = (data[key] ? (items.includes(data[key]) ? items.filter(c => c !== data[key]) : [...items, data[key]]) : items).join(',');

package/components/checkout/cart/cart_entities_group/cart-entities-group.vue

@@ -50,7 +50,7 @@
               :key="`${entity.guid}_${index}`"
               class="lc_regular12 lc_grey1">
               <div>
-                {{ print.printArea.name }} | {{ print.printSize.name }} | {{ print.printType.name }}
+                {{ print.printArea.name }} | {{ print.printSize.name }} | {{ print.printType ? print.printType.name : '' }}
               </div>
             </div>
           </div>

package/components/checkout/cart/cart_entities_group/cart_entities_group_prints/cart_entities_group_print/cart-entities-group-print.vue

@@ -1,7 +1,7 @@
 <template>
   <tr>
     <td class="lc_body-small">
-      {{ print.printType.name }}
+      {{ print.printType ? print.printType.name : '' }}
     </td>
     <td class="lc_body-small">
       {{ print.printArea.name }}

package/components/checkout/cart/cart_entities_group_table/cart_entities_group_tr/cart-entities-group-tr.vue

@@ -46,7 +46,7 @@
               :key="`${entity.guid}_${index}`"
               class="lc_regular12 lc_grey1">
               <div>
-                {{ print.printArea.name }} | {{ print.printSize.name }} | {{ print.printType.name }}
+                {{ print.printArea.name }} | {{ print.printSize.name }} | {{ print.printType ? print.printType.name : '' }}
               </div>
             </div>
           </div>

package/components/checkout/cart/cart_entity/cart_entity_prints/cart_entity_print/cart-entity-print.vue

@@ -3,7 +3,7 @@
     <tr>
       <td class="lc_body-small">
         <span class="hidden-md-and-up">Print Type</span>
-        {{ print.printType.name }}
+        {{ print.printType ? print.printType.name : '' }}
       </td>
       <td class="lc_body-small">
         <span class="hidden-md-and-up">Location</span>

package/components/common/client_settings_stock_country/client-settings-stock-country.vue

@@ -16,7 +16,7 @@
 </template>
   
 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters, mapMutations } from 'vuex';
 
 const Cookie = process.client ? require('js-cookie') : undefined;
 
@@ -44,9 +44,12 @@ export default {
     }
   },
   methods: {
+    ...mapMutations([
+      'setStockCountry'
+    ]),
     selectStockCountry(stockCountry) {
       this.saveStockCountry(stockCountry);
-      window.location.reload();
+      this.setStockCountry(stockCountry);
     },
     saveStockCountry(stockCountry) {
       const value = (stockCountry && stockCountry.isoCode !== 'world') ? stockCountry?._id : null

package/components/editor/editor_product_details/editor-product-details.vue

@@ -129,7 +129,9 @@
       <client-only>
         <gallery
           v-if="hasImages"
-          :show-big-image="false" />
+          :show-big-image="false"
+          :image-types="['model']"
+          :show-filters="false" />
       </client-only>
     </div>
     <div
@@ -169,6 +171,7 @@ import ProductSideWithPrint from '@lancom/shared/components/common/product_side_
 import RichText from '@lancom/shared/components/common/rich-text';
 import QuoteRequestModal from '@lancom/shared/components/quotes/quote_request_modal/quote-request-modal';
 import Gallery from '@lancom/shared/components/product/gallery/gallery';
+import { isValidImageType } from '@lancom/shared/assets/js/utils/colors';
 
 export default {
   name: 'EditorProductDetails',
@@ -216,7 +219,10 @@ export default {
       'country'
     ]),
     hasImages() {
-      return this.images.length > 0;
+      return this.modelImages.length > 0;
+    },
+    modelImages() {
+      return this.images.filter(i => isValidImageType(i, 'model'));
     },
     previewPrintProduct() {
       return {

package/components/editor/editor_workspace/editor-workspace.scss

@@ -85,7 +85,11 @@
     position: fixed;
     right: 20px;
     top: 20px;
-    font-size: 28px;
+    font-size: 18px;
+    display: flex;
+    .Btn__wrapper {
+      height: 40px;
+    }
   }
   &__side {
     position: absolute;

package/components/editor/editor_workspace/editor-workspace.vue

@@ -84,9 +84,14 @@
           </div>
           <div
             v-if="isZoomIn"
-            class="EditorWorkspace__zoom-out"
-            @click="zoomOut()">
-            <i class="icon-cancel"></i>
+            class="EditorWorkspace__zoom-out">
+            <btn
+              btn-class="green"
+              btn-label="Save"
+              @onclick="zoomOut()" />
+            <btn
+              btn-label="Cancel"
+              @onclick="zoomOut(true)" />
           </div>
         </div>
       </client-only>
@@ -149,6 +154,7 @@ export default {
     ...mapGetters([
       'product',
       'selectedLayer',
+      'selectedLayerCopy',
       'productDetailsLoaded',
       'selectedPrintArea',
       'editablePrintArea',
@@ -217,10 +223,14 @@ export default {
       'setEditableSide',
       'setSelectedPrintArea',
       'setEditablePrintArea',
-      'setSelectedLayer'
+      'setSelectedLayer',
+      'updateTemplateLayer'
     ]),
-    zoomOut() {
-      this.setSelectedLayer(null);
+    zoomOut(isCancel) {
+      if (isCancel) {
+        this.updateTemplateLayer(this.selectedLayerCopy);
+      }
+      setTimeout(() => this.setSelectedLayer(null), 100);
     },
     onWorkspaceChange({ size, fabricHelper }) {
       this.fabricHelper = fabricHelper;

package/components/editor/editor_workspace/editor_workspace_side/editor-workspace-side.scss

@@ -6,14 +6,20 @@
     transition: background-color 0.5s ease;
     background-color: white;
   }
-  &__toggle-wireframe {
+  &__toggle-bg {
     position: absolute;
+    top: 5px;
+    display: flex;
+    left: 0;
+    right: 0;
+  }
+  &__toggle-wireframe {
     z-index: 1001;
     background: gainsboro;
     padding: 6px;
-    top: 5px;
     font-size: 14px;
     cursor: pointer;
+    margin-right: 5px;
     &--active {
       background: rgb(196, 226, 236);
     }

package/components/editor/editor_workspace/editor_workspace_side/editor-workspace-side.vue

@@ -7,15 +7,29 @@
     }"
     v-click-outside="onOutsideClick"
     @mouseover="toogleBoundBox(true)"
-    @mouseleave="toogleBoundBox(false)">
+    @mouseleave="toogleBoundBox(false)"
+    @mouseup="toggleOnpressImage(false)">
     <div
-      v-if="hasWireframeImage"
-      class="EditorWorkspaceSide__toggle-wireframe"
-      :class="{
-        'EditorWorkspaceSide__toggle-wireframe--active': visibleWireframe
-      }"
-      @click.stop.prevent="toggleWireframeImage">
-      {{ visibleWireframe ? 'Hide Wireframe' : 'Show Wireframe' }}
+      v-if="hasOnpressImage || hasWireframeImage"
+      class="EditorWorkspaceSide__toggle-bg">
+      <div
+        v-if="hasWireframeImage"
+        class="EditorWorkspaceSide__toggle-wireframe"
+        :class="{
+          'EditorWorkspaceSide__toggle-wireframe--active': visibleWireframe
+        }"
+        @click.stop.prevent="toggleWireframeImage">
+        {{ visibleWireframe ? 'Hide Wireframe' : 'Show Wireframe' }}
+      </div>
+      <div
+        v-if="hasOnpressImage"
+        class="EditorWorkspaceSide__toggle-wireframe"
+        :class="{
+          'EditorWorkspaceSide__toggle-wireframe--active': visibleOnpress
+        }"
+        @mousedown.stop.prevent="toggleOnpressImage(true)">
+        {{ visibleOnpress ? 'Hide On Press' : 'Show On Press' }}
+      </div>
     </div>
     <div
       v-if="deleteButtonPos"
@@ -149,6 +163,7 @@ export default {
     return {
       addedFromCanvas: false,
       visibleWireframe: false,
+      visibleOnpress: false,
       fabricHelper: null,
       redrawWithThrottle: throttle(this.redraw, 100, { trailing: false }),
       saveLayersAsImageWithDebounce: debounce(this.saveLayersAsImage, 400),
@@ -171,6 +186,7 @@ export default {
       'editableColor',
       'editableLayers',
       'selectedLayer',
+      'selectedLayerCopy',
       'editorSize',
       'editModeSelectedLayer'
     ]),
@@ -180,9 +196,15 @@ export default {
     hasWireframeImage() {
       return !!this.wireframeImage;
     },
+    hasOnpressImage() {
+      return !!this.onpressImage;
+    },
     wireframeImage() {
       return this.images.find(i => i.types?.includes('wireframe') && i.types?.includes(this.side));
     },
+    onpressImage() {
+      return this.product.images?.find(i => i.types?.includes('on_press') && i.color === this.editableColor?._id);
+    },
     sideEditableLayers() {
       return this.editableLayers.filter(l => l.sideId === this.side);
     },
@@ -250,6 +272,9 @@ export default {
     visibleWireframe() {
       this.updateBackgroundImage();
     },
+    visibleOnpress() {
+      this.updateBackgroundImage();
+    },
     layers() {
       this.redrawWithThrottle();
     },
@@ -304,6 +329,9 @@ export default {
     toggleWireframeImage() {
       this.visibleWireframe = !this.visibleWireframe;
     },
+    toggleOnpressImage(state) {
+      this.visibleOnpress = state;
+    },
     adjustSelectedArtDPI() {
       const measure = this.fabricHelper.getEditorDPI();
       const scale = measure / 75;
@@ -402,19 +430,22 @@ export default {
       const isMedium = this.calcWorkspaceSize(true) <= 400;
       const type = this.side === 'front' ? COLORS_IMAGES_TYPES.FRONT : COLORS_IMAGES_TYPES.BACK;
       const wireframeImageUrl = this.visibleWireframe && (isMedium ? this.wireframeImage?.medium : this.wireframeImage?.large);
+      const onpressImageUrl = this.visibleOnpress && (isMedium ? this.onpressImage?.medium : this.onpressImage?.large);
       const getter = isMedium ? getMediumColorImage : getLargeColorImage;
-      const imageUrl = wireframeImageUrl || getter(this.product, type, this.editableColor, false, ['wireframe']);
+      const imageUrl = wireframeImageUrl || onpressImageUrl || getter(this.product, type, this.editableColor, false, ['wireframe']);
       if (this.backgroundImage && this.backgroundImageUrl === imageUrl) {
         return this.fabricHelper.setBackgroundImage(this.backgroundImage);
       }
 
       this.backgroundImageLoaded = false;
+      this.backgroundImageUrl = imageUrl;
       fabric.Image.fromURL(imageUrl, image => {
-        image.scale(this.editorSize.width / image.width);
-        this.backgroundImage = image;
-        this.backgroundImageUrl = imageUrl;
-        this.backgroundImageLoaded = true;
-        this.fabricHelper.setBackgroundImage(this.backgroundImage);
+        if (this.backgroundImageUrl === imageUrl) {
+          image.scale(this.editorSize.width / image.width);
+          this.backgroundImage = image;
+          this.backgroundImageLoaded = true;
+          this.fabricHelper.setBackgroundImage(this.backgroundImage);
+        }
       });
     },
     removeSelected() {

package/components/order/order_view/order_product_prints/order_product_print/order-product-print.vue

@@ -3,7 +3,7 @@
     <tr>
       <td class="lc_body-small">
         <span :class="responsive ? 'hidden-md-and-up' : 'hidden'">Print Type</span>
-        {{ print.printType.name }}
+        {{ print.printType ? print.printType.name : '' }}
       </td>
       <td class="lc_body-small">
         <span :class="responsive ? 'hidden-md-and-up' : 'hidden'">Location</span>

package/components/product/gallery/gallery.vue

@@ -88,7 +88,7 @@
       </button>
     </div>
     <div
-      v-if="hasValidFilters"
+      v-if="showFilters && hasValidFilters"
       class="Gallery__filters">
       <div
         v-for="filter in validFilters"
@@ -127,6 +127,13 @@ export default {
     showBigImage: {
       type: Boolean,
       default: true
+    },
+    showFilters: {
+      type: Boolean,
+      default: true
+    },
+    imageTypes: {
+      type: Array
     }
   },
   data() {
@@ -160,7 +167,7 @@ export default {
       return this.validFilters.length > 1;
     },
     galleryImages() {
-      return this.images.filter(i => !(i.types || []).includes('designer'));
+      return this.imageTypes ? this.images.filter(i => isValidImageTypes(i, this.imageTypes)) : this.images.filter(i => !(i.types || []).includes('designer'));
     },
     validFilters() {
       return this.filters.filter(filter => (this.galleryImages || []).some(i => this.isValidImageByFilter(filter, i)));

package/components/product/product_colors_selector/product-colors-selector.vue

@@ -82,6 +82,7 @@
             </div>
           </div>
           <products-size-selector-color
+            :key="productDetailsKey"
             :with-gst="inclGSTFinal"
             class="ProductColorsSelector__section"
             :class="{
@@ -131,8 +132,8 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['taxName']),
-    ...mapGetters('product', ['editableColor', 'availableColors', 'visibleSteps', 'hasLayers', 'isPrintPricing', 'priceIncludeGST']),
+    ...mapGetters(['stockCountry', 'taxName']),
+    ...mapGetters('product', ['productDetailsKey', 'editableColor', 'availableColors', 'visibleSteps', 'hasLayers', 'isPrintPricing', 'priceIncludeGST']),
     selectedColor: {
       get() {
         return this.editableColor;

package/components/product/wizard/wizard_print_layers/wizard_print_layer/wizard-print-layer.vue

@@ -17,7 +17,7 @@
         <div class="lc_regular14 hidden-sm-and-up">
           Print type
         </div>
-        {{ layerPrintType.name }}
+        {{ layerPrintType ? layerPrintType.name : '-' }}
       </td>
       <td>
         <div class="lc_regular14 hidden-sm-and-up">

package/components/product/wizard/wizard_print_text_or_logo/wizard-print-text-or-logo.vue

@@ -107,7 +107,7 @@ export default {
               printArea: editablePrintArea._id,
               printSize: selectedPrintArea?._id,
               side: editablePrintArea.side,
-              printType: selectedPrintType._id
+              printType: selectedPrintType?._id
             }
           };
           if (layer.type === 'text') {

package/components/product/wizard/wizard_print_type/wizard_print_area_print_type/wizard-print-area-print-type.vue

@@ -95,7 +95,7 @@ export default {
   methods: {
     ...mapMutations('product', ['setSelectedPrintTypes']),
     isSelectedType(type) {
-      return this.selectedPrintType && this.selectedPrintType._id === type._id;
+      return this.selectedPrintType && this.selectedPrintType?._id === type._id;
     },
     selectPrintType(type) {
       this.setSelectedPrintTypes({ printArea: this.editablePrintArea._id, type });

package/components/products/products_aside/products-aside.vue

@@ -23,6 +23,16 @@
           :has-selected-icon="hasSelectedIcon"
           :selected-icon-circle="selectedIconCircle" />
       </div>
+      <div class="ProductsAside__item">
+        <products-production-time
+          :has-selected-icon="hasSelectedIcon"
+          :selected-icon-circle="selectedIconCircle" />
+      </div>
+      <div class="ProductsAside__item">
+        <products-minimum-qty
+          :has-selected-icon="hasSelectedIcon"
+          :selected-icon-circle="selectedIconCircle" />
+      </div>
       <div class="ProductsAside__item">
         <products-colors />
       </div>
@@ -44,6 +54,8 @@ import ProductsBrands from '@lancom/shared/components/products/products_brands/p
 import ProductsTags from '@lancom/shared/components/products/products_tags/products-tags';
 import ProductsAttributes from '@lancom/shared/components/products/products_attributes/products-attributes';
 import ProductsColors from '@lancom/shared/components/products/products_colors/products-colors';
+import ProductsProductionTime from '@lancom/shared/components/products/products_production_time/products-production-time';
+import ProductsMinimumQty from '@lancom/shared/components/products/products_minimum_qty/products-minimum-qty';
 import { generateProductsLink } from '@lancom/shared/assets/js/utils/product';
 
 export default {
@@ -53,7 +65,9 @@ export default {
     ProductsBrands,
     ProductsTags,
     ProductsAttributes,
-    ProductsColors
+    ProductsColors,
+    ProductsProductionTime,
+    ProductsMinimumQty
   },
   props: {
     hasSelectedIcon: {

package/components/products/products_link/products-link.vue

@@ -27,6 +27,12 @@ export default {
     color: {
       type: String
     },
+    productionTime: {
+      type: String
+    },
+    minimumQty: {
+      type: String
+    },
     attributes: {
       type: Object
     },
@@ -45,6 +51,8 @@ export default {
         brand: this.brand,
         tags: this.tags,
         colors: this.color,
+        productionTime: this.productionTime,
+        minimumQty: this.minimumQty,
         option: this.option,
         text: this.text,
         sort: this.sort,

package/components/products/products_minimum_qty/products-minimum-qty.scss

@@ -0,0 +1,39 @@
+@import "@/assets/scss/variables";
+
+.ProductsMinimumQty {
+  &__header {
+    font-size: 22px;
+    line-height: 20px;
+    font-weight: 600;
+    margin-top: 3px;
+    margin-bottom: 24px;
+    color: $black;
+  }
+  &__item {
+    margin: 13px 0;
+    font-size: 15px;
+    font-weight: 400;
+    i {
+      font-size: 20px;
+      margin-right: 10px;
+    }
+    a {
+      color: $grey_1;
+      text-decoration: none;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+    &--active a {
+      color: $green;
+    }
+    &-icon {
+      margin-right: 10px;
+      background-position: center;
+      background-repeat: no-repeat;
+      background-size: contain;
+      width: 20px;
+      height: 20px;
+    }
+  }
+}

package/components/products/products_minimum_qty/products-minimum-qty.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="ProductsMinimumQty__wrapper">
+    <toggle-content label="Minimum Qty">
+      <div
+        v-for="minimumQtyRange in minimumQtyRanges"
+        :key="minimumQtyRange.alias"
+        class="ProductsMinimumQty__item"
+        :class="{
+          'ProductsMinimumQty__item--active': isSelectedMinimumQty(minimumQtyRange)
+        }">
+        <products-link
+          class="ProductsMinimumQty__more"
+          :minimum-qty="isSelectedMinimumQty(minimumQtyRange) ? null : minimumQtyRange.alias">
+          <span>
+            {{ minimumQtyRange.name }}
+          </span>
+          <checked-icon
+            v-if="hasSelectedIcon"
+            :checked="isSelectedMinimumQty(minimumQtyRange)"
+            :circle="selectedIconCircle" />
+        </products-link>
+      </div>
+    </toggle-content>
+  </div>
+</template>
+
+<script>
+import ToggleContent from '@lancom/shared/components/common/toggle-content';
+import ProductsLink from '@lancom/shared/components/products/products_link/products-link';
+import CheckedIcon from '@lancom/shared/components/common/checked-icon';
+
+export default {
+  name: 'ProductsMinimumQty',
+  components: {
+    ProductsLink,
+    ToggleContent,
+    CheckedIcon
+  },
+  props: {
+    hasSelectedIcon: {
+      type: Boolean,
+      default: false
+    },
+    selectedIconCircle: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      minimumQtyRanges: [{
+        alias: 'no-minimums',
+        name: 'No minimums'
+      }, {
+        alias: '6-or-less',
+        name: '6 or less'
+      }, {
+        alias: '12-or-less',
+        name: '12 or less'
+      }, {
+        alias: '25-or-less',
+        name: '25 or less'
+      }, {
+        alias: '50-or-less',
+        name: '50 or less'
+      }, {
+        alias: '100-or-less',
+        name: '100 or less'
+      }]
+    };
+  },
+  computed: {
+    selectedMinimumQties() {
+      const minimumQty = (this.$route.query.minimumQty || '').split(',');
+      return this.minimumQtyRanges.filter(minimumQtyRange => minimumQty.includes(minimumQtyRange.alias));
+    }
+  },
+  methods: {
+    isSelectedMinimumQty(minimumQty) {
+      return this.selectedMinimumQties.some(mq => mq.alias === minimumQty.alias);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import 'products-minimum-qty';
+</style>

package/components/products/products_production_time/products-production-time.scss

@@ -0,0 +1,39 @@
+@import "@/assets/scss/variables";
+
+.ProductsProductionTime {
+  &__header {
+    font-size: 22px;
+    line-height: 20px;
+    font-weight: 600;
+    margin-top: 3px;
+    margin-bottom: 24px;
+    color: $black;
+  }
+  &__item {
+    margin: 13px 0;
+    font-size: 15px;
+    font-weight: 400;
+    i {
+      font-size: 20px;
+      margin-right: 10px;
+    }
+    a {
+      color: $grey_1;
+      text-decoration: none;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+    &--active a {
+      color: $green;
+    }
+    &-icon {
+      margin-right: 10px;
+      background-position: center;
+      background-repeat: no-repeat;
+      background-size: contain;
+      width: 20px;
+      height: 20px;
+    }
+  }
+}

package/components/products/products_production_time/products-production-time.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="ProductsProductionTime__wrapper">
+    <toggle-content label="Production Time">
+      <div
+        v-for="produnctionRange in produnctionTimesRanges"
+        :key="produnctionRange.alias"
+        class="ProductsProductionTime__item"
+        :class="{
+          'ProductsProductionTime__item--active': isSelectedProdunctionTime(produnctionRange)
+        }">
+        <products-link
+          class="ProductsProductionTime__more"
+          :production-time="isSelectedProdunctionTime(produnctionRange) ? null : produnctionRange.alias">
+          <span>
+            {{ produnctionRange.name }}
+          </span>
+          <checked-icon
+            v-if="hasSelectedIcon"
+            :checked="isSelectedProdunctionTime(produnctionRange)"
+            :circle="selectedIconCircle" />
+        </products-link>
+      </div>
+    </toggle-content>
+  </div>
+</template>
+
+<script>
+import ToggleContent from '@lancom/shared/components/common/toggle-content';
+import ProductsLink from '@lancom/shared/components/products/products_link/products-link';
+import CheckedIcon from '@lancom/shared/components/common/checked-icon';
+
+export default {
+  name: 'ProductsProductionTime',
+  components: {
+    ProductsLink,
+    ToggleContent,
+    CheckedIcon
+  },
+  props: {
+    hasSelectedIcon: {
+      type: Boolean,
+      default: false
+    },
+    selectedIconCircle: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      produnctionTimesRanges: [{
+        alias: 'same-day',
+        name: 'Same day'
+      }, {
+        alias: '3-days',
+        name: 'Rush 3 day'
+      }, {
+        alias: '10-days',
+        name: '10 days'
+      }, {
+        alias: '2-weeks',
+        name: '2 weeks'
+      }, {
+        alias: '4-weeks',
+        name: '4 or more weeks'
+      }]
+    };
+  },
+  computed: {
+    selectedProdunctionTimes() {
+      const productionTime = (this.$route.query.productionTime || '').split(',');
+      return this.produnctionTimesRanges.filter(produnctionTimesRange => productionTime.includes(produnctionTimesRange.alias));
+    }
+  },
+  methods: {
+    isSelectedProdunctionTime(produnctionTime) {
+      return this.selectedProdunctionTimes.some(pt => pt.alias === produnctionTime.alias);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import 'products-production-time';
+</style>

package/components/quotes/quote_view/quote_product_prints/quote_product_print/quote-product-print.vue

@@ -3,7 +3,7 @@
     <tr>
       <td class="lc_body-small">
         <span class="hidden-md-and-up">Print Type</span>
-        {{ print.printType.name }}
+        {{ print.printType ? print.printType.name : '' }}
       </td>
       <td class="lc_body-small">
         <span class="hidden-md-and-up">Location</span>

package/feeds/google-shopping.js

@@ -59,15 +59,17 @@ async function googleShoppingFeed(axios, config, availableStores, country, isEdi
                 .replace(/·/, '·');
                 
               let link = `https://${config.HOST_NAME}${generateProductLink(product, sp.color, isEditor)}`;
+              link = link.includes('?') ? `${link}&price=IT` : `${link}?price=IT`
               if (sp.multipackQty) {
-                link = `${link}&multipack=${sp.SKU}`
+                link = link.includes('?') ? `${link}&multipack=${sp.SKU}` : `${link}?multipack=${sp.SKU}`;
               }
 
               const productWeight = +((product.weight || 0) * (sp.multipackQty || 1)).toFixed(3);
               const info = {
-                title: { _text: sp.title || title },
-                description: { _text: sp.description || description },
+                'g:title': { _text: sp.title || title },
+                'g:description': { _text: sp.description || description },
                 link: { _text: link },
+                'g:canonical_link': { _text: link.split('?')[0] },
                 'g:id': { _text: sp.SKU },
                 'g:item_group_id': { _text: product.SKU },
                 'g:size': { _text: sp.size.name },
@@ -160,7 +162,7 @@ async function googleShoppingFeed(axios, config, availableStores, country, isEdi
 
               for (let label = 0; label <= 4; label++) {
                 if (product[`feedCustomLabel${label}`]) {
-                  info[`custom_label_${label}`] = { _text: product[`feedCustomLabel${label}`] };
+                  info[`g:custom_label_${label}`] = { _text: product[`feedCustomLabel${label}`] };
                 }
               }
 

package/layouts/products.vue

@@ -257,7 +257,6 @@
           }
   
           const image = getProductLargeCover(product, 'front') || getProductMediumCover(product, 'front');
-          console.log('image: ', image, product.images);
           if (image) {
             schema.image = image;
           }

package/middleware/page-info.js

@@ -1,15 +1,28 @@
-export default async function ({ store, route, redirect }) {
+export default async function ({ store, route, redirect, error }) {
   const matchedRoute = route.matched[route.matched.length - 1];
   if (matchedRoute) {
     const path = matchedRoute.path.replace(/\?/g, '');
     const data = {
       shop: store.getters.shop._id,
       route: path || '/',
-      fullPath: route.fullPath
+      fullPath: route.path
     };
     const routeInfo = await store.dispatch('page/fetchRouteInfo', data);
     if (routeInfo?.type === 'redirect' && routeInfo.redirectTo) {
-      redirect(301, routeInfo.redirectTo);
+      redirect(301, route.fullPath.replace(route.path, routeInfo.redirectTo));
+    }
+  } else {
+    const data = {
+      shop: store.getters.shop._id,
+      route: route.path || '/',
+      fullPath: route.path
+    };
+    const routeInfo = await store.dispatch('page/fetchRouteInfo', data);
+    if (routeInfo?.type === 'deleted') {
+      error({
+        statusCode: 410,
+        message: 'Page has been deleted'
+      });
     }
   }
 }

package/mixins/meta-info.js

@@ -39,7 +39,7 @@ const metaInfo = {
   head() {
     const hasQueryParams = Object
       .keys(this.$route.query || {})
-      .filter(key => !['color', 'store'].includes(`${key || ''}`.toLowerCase()))
+      .filter(key => !['color', 'store','price'].includes(`${key || ''}`.toLowerCase()))
       .length > 0;
 
     const { short_text: shortText, image, meta = {} } = this.routeInfo || {};

package/mixins/print-layer.js

@@ -38,8 +38,8 @@ export default {
       return this.layerPrintSizes.find(({ _id }) => _id === this.layer.printSize);
     },
     layerPrintPricing() {
-      const printArea = this.layerPrintType.printAreas.find(({ printSizes }) => printSizes.map(({ _id }) => _id).includes(this.layer.printSize)) || this.layerPrintType.printAreas[0];
-      return printArea.printCost;
+      const printArea = this.layerPrintType?.printAreas.find(({ printSizes }) => printSizes.map(({ _id }) => _id).includes(this.layer.printSize)) || this.layerPrintType?.printAreas[0];
+      return printArea?.printCost;
     }
   }
 };

package/mixins/product-view.js

@@ -53,6 +53,9 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
       if (query.store) {
         await store.dispatch('product/updatePriceIncludeGST', true);
       }
+      if (query.price) {
+        store.commit('product/setPriceIncludeGST', query.price === 'IT');
+      }
     } catch (e) {
       console.log(e);
     }
@@ -77,9 +80,17 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
       preSetPrintPricing: false
     };
   },
+  watch: {
+    async stockCountryId(prev, curr) {
+      await this.loadProductStockDetails();
+    }
+  },
   computed: {
     ...mapGetters(['shop', 'gstTax', 'country', 'stockCountry', 'currency']),
     ...mapGetters('product', ['product', 'simpleProducts', 'productDetails', 'editableColor', 'images', 'preSetPrints', 'editorSize', 'printsPrice']),
+    stockCountryId() {
+      return this.stockCountry?._id || null;
+    },
     pageItemImage() {
       return this.mainProductImageSrc;
     },
@@ -112,21 +123,12 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
     this.fillBreadcrumbs();
   },
   async mounted() {
-    const { slug } = this.$route.params;
-    const { color, colour, multipack } = this.$route.query;
-    const data = {
-      shop: this.shop._id,
-      slug,
-      country: this.country?._id,
-      stockCountry: this.stockCountry?._id,
-      currency: this.currency?._id,
-      defaultColor: color || colour
-    };
     if (!this.product) {
-      await this.fetchProduct(data);
+      const query = this.getProductQuery();
+      await this.fetchProduct(query);
     }
 
-    await this.fetchProductDetails(data);
+    await this.loadProductStockDetails();
 
     try {
       if (this.preSetPrints?.length) {
@@ -168,7 +170,7 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
     }
     
     this.fillBreadcrumbs();
-
+    const { multipack } = this.$route.query;
     if (multipack) {
       const [SKU, qty] = multipack.split('-multipack-');
       const simpleProduct = this.simpleProducts.find(sp => sp.SKU === SKU);
@@ -189,9 +191,27 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
     this.clearProduct();
   },
   methods: {
-    ...mapActions(['fetchProduct', 'fetchProductDetails', 'selectColor']),
-    ...mapMutations(['clearProduct', 'clearTemplate', 'addTemplateLayer', 'setSimpleProductAmount']),
+    ...mapActions(['fetchProduct', 'fetchProductDetails', 'fetchProductStockDetails', 'selectColor']),
+    ...mapMutations(['clearProduct', 'clearTemplate', 'addTemplateLayer', 'setSimpleProductAmount', 'setPriceIncludeGST']),
     staticLink,
+    getProductQuery() {
+      const { slug } = this.$route.params;
+      const { color, colour } = this.$route.query;
+      const data = {
+        shop: this.shop._id,
+        slug,
+        country: this.country?._id,
+        stockCountry: this.stockCountry?._id,
+        currency: this.currency?._id,
+        defaultColor: color || colour
+      };
+
+      return data;
+    },
+    loadProductStockDetails() {
+      const query = this.getProductQuery();
+      this.fetchProductStockDetails(query);
+    },
     goToInfoTab(tab) {
       this.$refs.infoTabs.selectedTab = tab;
       const { $el } = this.$refs.infoTabs;

package/package.json

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

package/store/cart.js

@@ -165,7 +165,6 @@ export const actions = {
     try {
       commit('setCartPricingCalculating', true);
       const response = await api.calculateProductPrice(payload, shop._id);
-      console.log('response: ', response);
       commit('setCartPricing', response);
       commit('setCartPricingError', null);
     } catch (e) {
@@ -237,7 +236,6 @@ export const mutations = {
     state.coupon = coupon;
   },
   setCartPricing(state, price) {
-    console.log('setCartPricing: ', price);
     state.cartPricing = price;
   },
   setCartPricingCalculating(state, calculating) {

package/store/product.js

@@ -13,6 +13,7 @@ export const state = () => ({
   multipack: null,
   calculatingPrice: false,
   loadingProductDetails: false,
+  productDetailsKey: Date.now(),
   images: [],
   priceIncludeGST: false,
   product: null,
@@ -35,6 +36,7 @@ export const state = () => ({
   isPrintPricing: false,
   editableColor: null,
   selectedLayer: null,
+  selectedLayerCopy: null,
   editablePrintArea: null,
   editablePrintAreas: [],
   selectedPrintType: null,
@@ -50,6 +52,7 @@ export const state = () => ({
 });
 
 export const getters = {
+  productDetailsKey: ({ productDetailsKey }) => productDetailsKey,
   loadingProductDetails: ({ loadingProductDetails }) => loadingProductDetails,
   multipack: ({ multipack }) => multipack,
   calculatingPrice: ({ calculatingPrice }) => calculatingPrice,
@@ -80,6 +83,7 @@ export const getters = {
   editableColor: ({ editableColor }) => editableColor,
   editableLayers: ({ template, editableColor, editablePrintArea }) => template.layers,
   selectedLayer: ({ selectedLayer }) => selectedLayer,
+  selectedLayerCopy: ({ selectedLayerCopy }) => selectedLayerCopy,
   editModeSelectedLayer: ({ editModeSelectedLayer }) => editModeSelectedLayer,
   selectedPrintAreas: ({ selectedPrintAreas }) => selectedPrintAreas,
   selectedPrintArea: ({ selectedPrintAreas, editablePrintArea }) =>
@@ -185,7 +189,8 @@ export const actions = {
     commit('setLoadingProductDetails', false);
 
     const catalogFrontColorId = getColorOfDefaultCatalogFrontImage(state.product);
-    const editableColor = state.availableColors.find(c => c.alias === defaultColor) ||
+    const editableColor = state.availableColors.find(c => c._id === state.editableColor?._id) ||
+      state.availableColors.find(c => c.alias === defaultColor) ||
       state.availableColors.find(c => c._id === catalogFrontColorId) ||
       state.availableColors[0];
     commit('setEditableColor', editableColor);
@@ -203,6 +208,13 @@ export const actions = {
     images = [...imagesGroups.values()].reduce((images, group) => [...images, ...group], []);
     commit('setImages', images);
   },
+  async fetchProductStockDetails({ commit }, { shop, slug, country, stockCountry, currency }) {
+    const params = { country, currency, stockCountry };
+    commit('setLoadingProductDetails', true);
+    const response = await api.fetchProductDetails(shop, slug, params);
+    commit('setProductStockDetails', response);
+    commit('setLoadingProductDetails', false);
+  },
   async fetchPrintTypes({ commit }, { shop }) {
     const response = await api.fetchPrintTypes(shop);
     commit('setPrintTypes', response);
@@ -295,7 +307,7 @@ export const mutations = {
   setProductDetails(state, simpleProducts) {
     const { preSetPrints } = state;
     const [preSetPrint] = preSetPrints || [];
-    simpleProducts = simpleProducts.filter(sp => !preSetPrint || (preSetPrint.colors || []).includes(sp.color._id) )
+    simpleProducts = simpleProducts.filter(sp => !preSetPrint || (preSetPrint.colors || []).includes(sp.color._id) );
     state.productDetails = { simpleProducts };
     const availableSizes = [];
     const sizesPerColor = simpleProducts.reduce((map, { color, size }) => {
@@ -319,6 +331,17 @@ export const mutations = {
       }
     }
     state.availableColors = sortByName(availableColors);
+    state.productDetailsKey = Date.now();
+  },
+  setProductStockDetails(state, simpleProducts) {
+    state.productDetails?.simpleProducts?.forEach(sp => {
+      const sp2 = simpleProducts.find(simpleProduct => simpleProduct.SKU === sp.SKU);
+      Vue.set(sp, 'quantityStock', sp2?.quantityStock || 0);
+    });
+    state.template?.simpleProducts?.forEach(sp => {
+      const sp2 = simpleProducts.find(simpleProduct => simpleProduct.SKU === sp.SKU);
+      Vue.set(sp, 'quantityStock', sp2?.quantityStock || 0);
+    });
   },
   clearProduct(state) {
     state.product = null;
@@ -358,6 +381,7 @@ export const mutations = {
   */
   setSelectedLayer(state, layer) {
     state.selectedLayer = layer;
+    state.selectedLayerCopy = JSON.parse(JSON.stringify(layer || null));
   },
   setEditModeSelectedLayer(state, editMode) {
     state.editModeSelectedLayer = editMode;