@lancom/shared 0.0.260 → 0.0.262

package/package.json

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

package/store/cart.js

@@ -148,9 +148,9 @@ export const actions = {
     await api.saveCart(payload, shop._id);
     commit('setEntities', entities);
   },
-  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, commit }, { shop, country }) {
+  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, commit }, { shop }) {
     const selectedSuppliersWithRates = cartPricing?.shipping?.suppliersWithRates;
-    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates, country);
+    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates);
     try {
       commit('setCartPricingCalculating', true);
       const response = await api.calculateProductPrice(payload, shop._id);
@@ -179,7 +179,7 @@ export const actions = {
   clearCart({ commit }) {
     commit('clearCart');
   },
-  async selectRate({ state: { cartPricing, entities, suburb, coupon }, commit }, { supplier, rate, shop, country }) {
+  async selectRate({ state: { cartPricing, entities, suburb, coupon }, commit }, { supplier, rate, shop }) {
     const suppliersWithRates = cartPricing.shipping.suppliersWithRates
       .map(supplierWithRates => ({
         ...(
@@ -190,7 +190,7 @@ export const actions = {
               })
             : supplierWithRates)
       }));
-    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, null, country);
+    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon);
     try {
       commit('setCartPricingCalculating', true);
       const response = await api.calculateProductPrice(payload, shop._id);
@@ -245,7 +245,7 @@ export const mutations = {
   }
 };
 
-function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, selectedSuppliersWithRates, country) {
+function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, selectedSuppliersWithRates) {
   const getSimpleObj = i => i && ({ _id: i._id, name: i.name });
   return {
     entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
@@ -285,7 +285,6 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon
     address: suburb ? [suburb.locality, suburb.state, suburb.postcode].filter(i => !!i).join(', ') : null,
     coupon,
     suppliersWithRates,
-    selectedSuppliersWithRates,
-    country: country?._id
+    selectedSuppliersWithRates
   };
 }

package/store/index.js

@@ -35,7 +35,6 @@ export const getters = {
   pricingSettings: ({ pricing }) => pricing || {},
   orderSettings: ({ orderInfo }) => orderInfo || {},
   gstTax: ({ pricing }) => pricing?.gstTax || 0,
-  taxName: ({ pricing }) => pricing?.taxName || 'GST',
   displayPricingWithTax: ({ pricing }) => !!pricing?.displayPricingWithTax,
   screenPrintsPrices: ({ pricing }) => pricing?.screenPrintsPrices || {},
   depositInfo: ({ depositInfo }) => depositInfo || {}
@@ -56,14 +55,13 @@ export const actions = {
     commit('setCountry', settings.country);
     commit('setCurrency', settings.currency);
 
-    const countrySettings = (shop.countries || []).find(c => c.country?._id === settings.country?._id) || { settings: [] };
-      
     if (process.env.PINPAYMENT_PUBLISHABLE_API_KEY) {
       commit('setPayment', {
         type: 'pinpayment',
         clientKey: process.env.PINPAYMENT_PUBLISHABLE_API_KEY
       });
     } else {
+      const countrySettings = (shop.countries || []).find(c => c.country?._id === settings.country?._id) || { settings: [] };
       const countrySetting = countrySettings.settings.find(s => !!s.settings.app.STRIPE_PUBLIC_KEY);
       if (countrySetting) {
         commit('setPayment', {
@@ -73,13 +71,6 @@ export const actions = {
       }
     }
 
-
-    const pricingSetting = (countrySettings?.settings || []).find(s => !!s.settings.pricing);
-    commit('setPricing', {
-      ...shop.settings.pricing,
-      ...(pricingSetting?.settings?.pricing || {})
-    });
-
     // }
     try {
       if (req.headers.cookie) {
@@ -108,7 +99,7 @@ export const actions = {
             commit('cart/setCoupon', coupon);
           } catch (e) {}
         }
-        dispatch('cart/calculateCartPrice', { shop, country });
+        dispatch('cart/calculateCartPrice', { shop });
       }
     }
     const closedNotification = localStorage.getItem(CLOSED_NOTIFICATION);
@@ -130,17 +121,15 @@ export const mutations = {
   setPayment(state, payment) {
     state.payment = payment;
   },
-  setPricing(state, pricing) {
-    state.pricing = pricing;
-  },
   setCountry(state, country) {
     state.country = country;
   },
   setCurrency(state, currency) {
     state.currency = currency;
   },
-  setSettings(state, { contacts, notificationBar, discountPopup, order, depositInfo }) {
+  setSettings(state, { contacts, pricing, notificationBar, discountPopup, order, depositInfo }) {
     state.contacts = contacts;
+    state.pricing = pricing;
     state.orderInfo = order;
     state.notificationBar = notificationBar;
     state.discountPopup = discountPopup;

package/store/product.js

@@ -160,7 +160,6 @@ export const actions = {
         commit('setSelectedPrintArea', { printArea: first._id, size: first.printSize });
       }
     } catch (e) {
-      console.log(e);
       const { status, data } = e?.response || {};
       const statusCode = status || 500;
       commit('setLoadError', {
@@ -200,10 +199,10 @@ export const actions = {
   async updatePriceIncludeGST({ commit }, value) {
     commit('setPriceIncludeGST', value);
   },
-  async calculateProductPrice({ state: { template, product, isPrintPricing }, commit, getters }, { shop, country }) {
+  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, country: country?._id }, shop._id);
+    const response = await api.calculateProductPrice({ entities }, shop._id);
     commit('setProductPricing', response);
     commit('setCalculatingPrice', false);
   },