@lancom/shared 0.0.169 → 0.0.171

package/assets/js/utils/gtm.js

@@ -1,5 +1,6 @@
 const gtm = {
   push(data, skipReset) {
+    console.log('push:data: ', data);
     window.dataLayer = window.dataLayer || [];
     if (!skipReset) {
       window.dataLayer.push(function() {

package/components/checkout/cart/cart_entity/cart-entity.scss

@@ -11,6 +11,17 @@
       padding: 15px;
     }
   }
+  &__same-day-dispatch {
+    width: 30px;
+    height: 30px;
+    background-image: url('/icons/same-day-dispatch.svg');
+    background-position: center center;
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: inline-block;
+    position: relative;
+    top: 7px;
+  }
   &__info {
     flex-grow: 1;
   }

package/components/checkout/cart/cart_entity/cart-entity.vue

@@ -12,7 +12,7 @@
         v-if="product.sameDayDispatch"
         class="lc_body-small">
         <div class="mt-5">
-          <i class="icon-delivery"></i>
+          <span class="CartEntity__same-day-dispatch"></span>
           <span>
             This product qualifies for same day dispatch.
             <nuxt-link

package/components/product/gallery/gallery.vue

@@ -173,11 +173,11 @@ export default {
     }
   },
   mounted() {
-    const index = this.filteredImages.findIndex(i => i.color === this.editableColor?._id);
-    if (index > -1) {
-      this.goToSlide(index, true);
-    }
-    console.log('filteredImages: ', this.filteredImages);
+    // const index = this.filteredImages.findIndex(i => i.color === this.editableColor?._id);
+    // if (index > -1) {
+    //   this.goToSlide(index, true);
+    // }
+    // console.log('filteredImages: ', this.filteredImages);
   },
   methods: {
     ...mapActions('product', ['selectColor']),

package/package.json

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

package/store/product.js

@@ -10,6 +10,8 @@ import { filterBigSize } from '@lancom/shared/assets/js/utils/product';
 import { sortByName } from '../assets/js/utils/filters';
 
 export const state = () => ({
+  calculatingPrice: false,
+  images: [],
   priceIncludeGST: false,
   product: null,
   preSetPrint: null,
@@ -43,6 +45,7 @@ export const state = () => ({
 });
 
 export const getters = {
+  calculatingPrice: ({ calculatingPrice }) => calculatingPrice,
   product: ({ product }) => product,
   preSetPrint: ({ preSetPrint }) => preSetPrint,
   preSetPrintPriceRange: ({ preSetPrint, product }) => {
@@ -117,15 +120,7 @@ export const getters = {
       ...printTypesMinQuantity
     );
   },
-  images: ({ product }) => {
-    const imagesGroups = new Map();
-    (product.images || [])
-      .filter(i => isValidImageTypes(i, ['front', 'back', 'model']))
-      .forEach(i => {
-        imagesGroups.set(i.color, [...(imagesGroups.get(i.color) || []), i]);
-      });
-    return [...imagesGroups.values()].reduce((images, group) => [...images, ...group], []);
-  },
+  images: ({ images }) => images,
   editableSide: ({ editableSide }) => editableSide,
   priceIncludeGST: ({ priceIncludeGST }) => priceIncludeGST,
   hasUnprintedPrice: ({ product }) => product.minUnprintedPrice || product.maxUnprintedPrice
@@ -162,15 +157,30 @@ export const actions = {
       state.availableColors.find(c => c._id === catalogFrontColorId) ||
       state.availableColors[0];
     commit('setEditableColor', editableColor);
+
+    let images = editableColor ? [
+      ...(state.product.images || []).filter(image => image.color === editableColor._id),
+      ...(state.product.images || []).filter(image => image.color !== editableColor._id)
+    ] : state.product.images;
+    const imagesGroups = new Map();
+    images
+      .filter(i => isValidImageTypes(i, ['front', 'back', 'model']))
+      .forEach(i => {
+        imagesGroups.set(i.color, [...(imagesGroups.get(i.color) || []), i]);
+      });
+    images = [...imagesGroups.values()].reduce((images, group) => [...images, ...group], []);
+    commit('setImages', images);
   },
   async fetchPrintTypes({ commit }, { shop }) {
     const response = await api.fetchPrintTypes(shop);
     commit('setPrintTypes', response);
   },
   async calculateProductPrice({ state: { template, product, isPrintPricing }, commit, getters }, shop) {
+    commit('setCalculatingPrice', true);
     const entities = getProductsForCalculatePricing(product, getters.usedSimpleProducts, template.layers, isPrintPricing, true);
     const response = await api.calculateProductPrice({ entities }, shop._id);
     commit('setProductPricing', response);
+    commit('setCalculatingPrice', false);
   },
   async createLayer(
     {
@@ -220,7 +230,7 @@ export const actions = {
       commit('addTemplateColor', color);
     }
     const lastSelectedColorId = colorSelected ? color : getters.templateColors[0];
-    if (lastSelectedColorId) {
+    if (lastSelectedColorId && getters.editableColor?._id !== lastSelectedColorId) {
       commit('setEditableColor', getters.availableColors.find(({ _id }) => lastSelectedColorId === _id));
     }
   }
@@ -238,12 +248,8 @@ export const mutations = {
   },
   setProductDetails(state, simpleProducts) {
     const { preSetPrint } = state;
-    console.log('');
-    console.log('setProductDetails: ');
-    console.log('simpleProducts1: ', simpleProducts);
     simpleProducts = simpleProducts.filter(sp => !preSetPrint || (preSetPrint.colors || []).includes(sp.color._id) )
     state.productDetails = { simpleProducts };
-    console.log('simpleProducts2: ', simpleProducts);
     const availableSizes = [];
     const sizesPerColor = simpleProducts.reduce((map, { color, size }) => {
       if (!map[color.alias]) {
@@ -405,6 +411,12 @@ export const mutations = {
   },
   setEditableSide(state, side) {
     state.editableSide = side;
+  },
+  setImages(state, images) {
+    state.images = images;
+  },
+  setCalculatingPrice(state, calculatingPrice) {
+    state.calculatingPrice = calculatingPrice;
   }
 };