@lancom/shared 0.0.280 → 0.0.282

package/routes/index.js

@@ -24,5 +24,40 @@ module.exports = function(routes, resolve) {
     path: '/order/:token/refund/:refund',
     component: resolve('@lancom/shared/pages/order/_token/refund/_refund.vue'),
     chunkName: 'pages/order/view/refund'
+  }, {
+    name: 'customer-signin',
+    path: '/customer/signin',
+    component: resolve('@lancom/shared/pages/customer/signin.vue'),
+    chunkName: 'pages/customer/signin'
+  }, {
+    name: 'customer-settings',
+    path: '/customer/settings',
+    component: resolve('@lancom/shared/pages/customer/settings.vue'),
+    chunkName: 'pages/customer/settings'
+  }, {
+    name: 'customer-recovery',
+    path: '/customer/recovery',
+    component: resolve('@lancom/shared/pages/customer/recovery.vue'),
+    chunkName: 'pages/customer/recovery'
+  }, {
+    name: 'customer-create',
+    path: '/customer/create',
+    component: resolve('@lancom/shared/pages/customer/create.vue'),
+    chunkName: 'pages/customer/create'
+  }, {
+    name: 'customer-password-reset',
+    path: '/customer/password/:token',
+    component: resolve('@lancom/shared/pages/customer/password/_token.vue'),
+    chunkName: 'pages/customer/password/reset'
+  }, {
+    name: 'checkout-cart',
+    path: '/checkout/cart',
+    component: resolve('@lancom/shared/pages/checkout/cart.vue'),
+    chunkName: 'pages/checkout/cart'
+  }, {
+    name: 'checkout-order',
+    path: '/checkout/order',
+    component: resolve('@lancom/shared/pages/checkout/order.vue'),
+    chunkName: 'pages/checkout/reset'
   }];
 }

package/store/cart.js

@@ -113,6 +113,7 @@ export const actions = {
     }).filter(e => !!e);
     const payload = {
       _id: state.id || undefined,
+      currency: currency?._id,
       entities: [...cartEntities, ...entities]
     };
     const cart = await api.saveCart(payload, shop._id);
@@ -124,36 +125,42 @@ export const actions = {
       gtm.addToCart(addingEntities, pricing);
     }
   },
-  async removeSimpleProductsFromCart({ commit, state }, { simpleProducts, shop }) {
+  async removeSimpleProductsFromCart({ commit, state }, { simpleProducts, shop, currency }) {
     const removeGuids = (simpleProducts || []).map(e => e.guid);
     const entities = state.entities.map(entity => ({
       ...entity,
       simpleProducts: entity.simpleProducts.filter(sp => !removeGuids.includes(sp.guid))
     })).filter(({ simpleProducts }) => simpleProducts.length > 0);
-    const payload = { _id: state.id, entities };
+    const payload = {
+      _id: state.id,
+      entities, 
+      currency: currency?._id
+    };
     await api.saveCart(payload, shop._id);
     commit('setEntities', entities);
     if (state.cartPricing) {
       gtm.removeFromCart(simpleProducts, state.cartPricing);
     }
   },
-  async removeSupplier({ commit, state }, { supplier, shop }) {
+  async removeSupplier({ commit, state }, { supplier, shop, currency }) {
     const brands = supplier.brands.map(({ _id }) => _id);
     const entities = state.entities.filter(entity => !brands.includes(entity.product.brand._id));
     if (state.cartPricing) {
       const simpleProducts = entities.reduce((items, entity) => [...items, ...entity.simpleProducts], []);
       gtm.removeFromCart(simpleProducts, state.cartPricing);
     }
-    const payload = { _id: state.id, entities };
+    const payload = { _id: state.id, entities, currency: currency?._id};
     await api.saveCart(payload, shop._id);
     commit('setEntities', entities);
   },
   async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, commit }, { shop, country }) {
     const selectedSuppliersWithRates = cartPricing?.shipping?.suppliersWithRates;
     const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates, country);
+    console.log('calculateCartPrice:payload: ', payload)
     try {
       commit('setCartPricingCalculating', true);
       const response = await api.calculateProductPrice(payload, shop._id);
+      console.log('response: ', response);
       commit('setCartPricing', response);
       commit('setCartPricingError', null);
     } catch (e) {
@@ -164,7 +171,7 @@ export const actions = {
       commit('setCartPricingCalculating', false);
     }
   },
-  async setSimpleProductAmount({ state, commit }, { guid, amount, shop }) {
+  async setSimpleProductAmount({ state, commit }, { guid, amount, shop, currency }) {
     const entities = (state.entities || []).map(product => ({
       ...product,
       simpleProducts: (product.simpleProducts || []).map(sp => ({
@@ -172,7 +179,7 @@ export const actions = {
         amount: sp.guid === guid ? +amount : sp.amount
       }))
     }));
-    const payload = { _id: state.id, entities };
+    const payload = { _id: state.id, entities, currency: currency?._id };
     await api.saveCart(payload, shop._id);
     commit('setEntities', entities);
   },
@@ -215,6 +222,7 @@ export const mutations = {
     state.id = id;
   },
   setEntities(state, entities) {
+    console.log('setEntities: ', entities);
     state.entities = entities;
   },
   setSuburb(state, suburb) {
@@ -224,6 +232,7 @@ export const mutations = {
     state.coupon = coupon;
   },
   setCartPricing(state, price) {
+    console.log('setCartPricing: ', price);
     state.cartPricing = price;
   },
   setCartPricingCalculating(state, calculating) {

package/store/order.js

@@ -19,9 +19,9 @@ export const actions = {
     const response = await api.createOrder({ ...order, recaptchaToken }, shop);
     commit('setOrderData', response);
   },
-  async submitPayment({ commit, state: { orderData } }, { card, payment, country, shop, recaptchaToken }) {
+  async submitPayment({ commit, state: { orderData } }, { card, payment, country, shop, currency, recaptchaToken }) {
     const { _id } = orderData || {};
-    const response = await api.createOrderPayment(_id, { card, shop, country, payment, recaptchaToken });
+    const response = await api.createOrderPayment(_id, { card, shop, country, payment, currency, recaptchaToken });
     commit('setOrderData', response);
     return {};
   },

package/store/product.js

@@ -82,11 +82,7 @@ export const getters = {
   availableColors: ({ availableColors }) => availableColors,
   availableSizes: ({ availableSizes }) => availableSizes,
   editableColor: ({ editableColor }) => editableColor,
-  editableLayers: ({ template, editableColor, editablePrintArea }) => template.layers
-    .filter(({ printArea }) => (
-      // colorId === editableColor._id &&
-      printArea === editablePrintArea?._id
-    )),
+  editableLayers: ({ template, editableColor, editablePrintArea }) => template.layers,
   selectedLayer: ({ selectedLayer }) => selectedLayer,
   editModeSelectedLayer: ({ editModeSelectedLayer }) => editModeSelectedLayer,
   selectedPrintAreas: ({ selectedPrintAreas }) => selectedPrintAreas,
@@ -106,6 +102,8 @@ export const getters = {
   printArea: ({ editablePrintArea, editorSize: { width, height }, product }) => {
     return getPrintAreaByName({
       printArea: editablePrintArea?._id,
+      printSize: editablePrintArea?.printSize,
+      printAreaOffsets: editablePrintArea?.printAreaOffsets,
       editorWidth: width,
       editorHeight: height
     }, product);
@@ -122,7 +120,7 @@ export const getters = {
   minimumOrderQuantity: ({ product, template }) => {
     const layersPrintTypes = (template.layers || []).map(({ printType }) => printType);
     const printTypesMinQuantity = (product.printTypes || [])
-      .filter(printType => layersPrintTypes.includes(printType._id))
+      .filter(printType => layersPrintTypes.includes(printType._id || printType))
       .map(printType => printType.minQuantity);
     return Math.max(
       product.minimumOrderQuantity,
@@ -162,12 +160,6 @@ export const actions = {
       const product = await api.fetchProduct(shop, slug, query);
       commit('setProduct', product);
       commit('setPreSetPrint', (product.prints || []).find(({ _id }) => _id === print));
-
-      const [first] = (product.printAreas || []);
-      if (first) {
-        commit('setEditablePrintArea', first);
-        commit('setSelectedPrintArea', { printArea: first._id, size: first.printSize });
-      }
     } catch (e) {
       console.log(e);
       const { status, data } = e?.response || {};
@@ -248,6 +240,7 @@ export const actions = {
         printType: selectedPrintType?._id
       }
     });
+    console.log('layer: ', layer);
     if (preselect) {
       commit('setSelectedLayer', layer);
     }