@lancom/shared 0.0.89 → 0.0.93

package/store/cart.js

@@ -6,7 +6,8 @@ export const state = () => ({
   id: null,
   entities: [],
   suburb: null,
-  cartPricing: null
+  cartPricing: null,
+  cartPricingError: null
 });
 
 const getSimpleProductsQuantity = simpleProducts => {
@@ -56,6 +57,7 @@ export const getters = {
   notValidPrintsQuantities(state, { quantities }) {
     return (quantities?.prints || []).filter(({ minQuantity, quantity }) => quantity < minQuantity);
   },
+  cartPricingError: ({ cartPricingError }) => cartPricingError
 };
 
 export const actions = {
@@ -96,37 +98,24 @@ export const actions = {
     await api.saveCart(payload, shop._id);
     commit('setEntities', entities);
   },
-  async calculateCartPrice({ state: { suburb, entities }, commit }, shop) {
-    const getSimpleObj = i => i && ({ _id: i._id, name: i.name });
-    const payload = {
-      entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
-        _id,
-        guid,
-        simpleProducts: simpleProducts.map(({ _id, guid, amount, pricing, unprintedPricing, weight = 0 }) => ({
-          amount,
-          pricing: (prints || []).length > 0 ? pricing : unprintedPricing,
-          weight: product.weight,
-          guid,
-          _id
-        })).filter(({ amount }) => +amount > 0),
-        prints: (prints || []).map(print => {
-          const { setupCost, freeSetupOver, printCost } = getPrintTypeSizePricing(print.printType, print.printSize?._id) || {};
-          return {
-            costType: print.printType.costType,
-            setupCost,
-            printCost,
-            freeSetupOver,
-            printType: getSimpleObj(print.printType),
-            printArea: getSimpleObj(print.printArea),
-            printSize: getSimpleObj(print.printSize)
-          };
-        }),
-        printSurcharge: product.printSurcharge || 0
-      })),
-      postcode: suburb && suburb.postcode
-    };
-    const response = await api.calculateProductPrice(payload, shop._id);
-    commit('setCartPricing', response);
+  async removeSupplier({ commit, state }, { supplier, shop }) {
+    const brands = supplier.brands.map(({ _id }) => _id);
+    const entities = state.entities.filter(entity => !brands.includes(entity.product.brand._id));
+    const payload = { _id: state.id, entities };
+    await api.saveCart(payload, shop._id);
+    commit('setEntities', entities);
+  },
+  async calculateCartPrice({ state: { suburb, entities }, commit }, { shop }) {
+    const payload = generateCalculatePriceData(entities, suburb);
+    try {
+      const response = await api.calculateProductPrice(payload, shop._id);
+      commit('setCartPricing', response);
+      commit('setCartPricingError', null);
+    } catch (e) {
+      const { error = 'Error calculate pricing' } = e.response?.data || {};
+      commit('setCartPricingError', error);
+      commit('setCartPricing', null);
+    }
   },
   async setSimpleProductAmount({ state, commit }, { guid, amount, shop }) {
     const entities = (state.entities || []).map(product => ({
@@ -142,6 +131,28 @@ export const actions = {
   },
   clearCart({ commit }) {
     commit('clearCart');
+  },
+  async selectRate({ state: { cartPricing, entities, suburb }, commit }, { supplier, rate, shop }) {
+    const suppliersWithRates = cartPricing.shipping.suppliersWithRates
+      .map(supplierWithRates => ({
+        ...(
+          supplierWithRates === supplier
+            ? ({
+                ...supplierWithRates,
+                rates: supplierWithRates.rates.map(r => ({ ...r, selected: rate === r }))
+              })
+            : supplierWithRates)
+      }));
+    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates);
+    try {
+      const response = await api.calculateProductPrice(payload, shop._id);
+      commit('setCartPricing', response);
+      commit('setCartPricingError', null);
+    } catch (e) {
+      const { error = 'Error calculate pricing' } = e.response?.data || {};
+      commit('setCartPricingError', error);
+      commit('setCartPricing', null);
+    }
   }
 };
 
@@ -162,10 +173,51 @@ export const mutations = {
   setCartPricing(state, price) {
     state.cartPricing = price;
   },
+  setCartPricingError(state, error) {
+    state.cartPricingError = error;
+  },
+  setSelectedRates(state, selectedRates) {
+    state.selectedRates = selectedRates;
+  },
   clearCart(state) {
     state.id = null;
     state.entities = [];
     state.cartPricing = null;
     state.suburb = null;
+    state.cartPricingError = null;
   }
 };
+
+function generateCalculatePriceData(entities, suburb, suppliersWithRates) {
+  const getSimpleObj = i => i && ({ _id: i._id, name: i.name });
+  return {
+    entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
+      _id,
+      guid,
+      brand: getSimpleObj(product.brand),
+      simpleProducts: simpleProducts.map(({ _id, guid, amount, pricing, unprintedPricing, weight = 0 }) => ({
+        amount,
+        pricing: (prints || []).length > 0 ? pricing : unprintedPricing,
+        weight: product.weight,
+        volume: product.volume,
+        guid,
+        _id
+      })).filter(({ amount }) => +amount > 0),
+      prints: (prints || []).map(print => {
+        const { setupCost, freeSetupOver, printCost } = getPrintTypeSizePricing(print.printType, print.printSize?._id) || {};
+        return {
+          costType: print.printType.costType,
+          setupCost,
+          printCost,
+          freeSetupOver,
+          printType: getSimpleObj(print.printType),
+          printArea: getSimpleObj(print.printArea),
+          printSize: getSimpleObj(print.printSize)
+        };
+      }),
+      printSurcharge: product.printSurcharge || 0
+    })),
+    postcode: suburb && suburb.postcode,
+    suppliersWithRates
+  };
+}

package/store/order.js

@@ -22,6 +22,7 @@ export const actions = {
       order.productsTotal = pricing.products?.products?.totalPriceWithoutTax || 0;
       order.printsTotal = pricing.products?.prints?.totalPriceWithoutTax || 0;
       order.shippingTotal = pricing.shipping?.totalPriceWithoutTax || 0;
+      order.suppliersWithRates = pricing.shipping?.suppliersWithRates || [];
     }
     const response = await api.createOrder(order, shop);
     commit('setOrderData', response);

package/store/product.js

@@ -133,7 +133,6 @@ export const actions = {
       commit('setProduct', response);
       commit('setPreSetPrint', (response.prints || []).find(({ _id }) => _id === print));
     } catch (e) {
-      console.log(e);
       const { status, data } = e?.response || {};
       const statusCode = status || 500;
       commit('setLoadError', {
@@ -305,7 +304,6 @@ export const mutations = {
       ...(state.template.layers || []).filter(l => l.guid !== layer.guid),
       layer
     ];
-    console.log('addTemplateLayer: ', layer);
     Vue.set(state.template, 'layers', layers);
   },
   removeTemplateLayer(state, layer) {

package/store/products.js

@@ -10,7 +10,8 @@ export const state = () => ({
   brands: [],
   tags: [],
   attributes: [],
-  loadError: null
+  loadError: null,
+  placeholder: false
 });
 
 export const getters = {
@@ -23,7 +24,8 @@ export const getters = {
   page: ({ page }) => page,
   count: ({ count }) => count,
   perPage: ({ perPage }) => perPage,
-  loadError: ({ loadError }) => loadError
+  loadError: ({ loadError }) => loadError,
+  placeholder: ({ placeholder }) => placeholder
 };
 
 export const actions = {
@@ -55,6 +57,9 @@ export const actions = {
 };
 
 export const mutations = {
+  setPlaceholder(state, placeholder) {
+    state.placeholder = placeholder;
+  },
   setProducts(state, products) {
     state.products = products;
   },