@lancom/shared 0.0.267 → 0.0.269

package/static/icons/print-area/sleeve-right_tee_right.svg

@@ -0,0 +1,12 @@
+<svg width="58" height="58" viewBox="0 0 58 58" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M10.9168 54.0892V27.5034L1.10645 17.5792L13.0223 6.96084L21.5579 3.86523L21.8425 5.12852C22.5834 9.06318 26.3736 11.6523 30.3083 10.9116C33.243 10.359 35.5387 8.06337 36.0914 5.12852L36.3759 3.86523L44.8888 6.96084L56.8046 17.5792L47.0057 27.492V54.0892H10.9168Z" fill="#F4F4F4"/>
+<path d="M45.673 6.10769C45.5638 6.0081 45.4363 5.93085 45.2975 5.88007L36.6366 2.78446C36.0458 2.56993 35.3929 2.87508 35.1784 3.46589C35.1397 3.57244 35.1172 3.68412 35.1115 3.79736C35.1115 4.04774 34.736 9.81786 28.9658 9.90891C23.1616 9.81786 22.7974 4.04774 22.786 3.79736C22.7524 3.1697 22.2164 2.68815 21.5887 2.72172C21.4809 2.72755 21.3743 2.74861 21.2723 2.78446L12.6228 5.91421C12.484 5.965 12.3565 6.04225 12.2473 6.14183L0.354216 16.7488C-0.101447 17.1817 -0.119941 17.9022 0.312961 18.3578C0.326333 18.3719 0.340133 18.3857 0.354216 18.3991L9.82314 27.9704V54.1465C9.82314 54.775 10.3327 55.2846 10.9612 55.2846H47.0387C47.6672 55.2846 48.1768 54.775 48.1768 54.1465V27.9704L57.6458 18.3991C58.1014 17.9662 58.1199 17.2458 57.687 16.7901C57.6736 16.776 57.6598 16.7622 57.6458 16.7488L45.673 6.10769ZM48.1427 24.7269V21.4461C48.1427 20.8176 47.6331 20.308 47.0046 20.308C46.3761 20.308 45.8665 20.8176 45.8665 21.4461V52.9515H12.0538V21.4461C12.0538 20.8176 11.5442 20.308 10.9157 20.308C10.2872 20.308 9.77762 20.8176 9.77762 21.4461V24.7382L2.77835 17.6479L13.613 7.95139L20.7374 5.37931C21.62 9.92684 26.022 12.898 30.5696 12.0154C33.9279 11.3635 36.5538 8.73767 37.2056 5.37931L44.3301 7.95139L55.1306 17.6479L48.1427 24.7269Z" fill="#303030"/>
+<rect x="12.9873" y="9" width="4.96536" height="12.0049" rx="1" transform="rotate(48.4693 12.9873 9)" fill="#303030"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="58" height="58" fill="white"/>
+</clipPath>
+</defs>
+</svg>

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 }) {
+  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, commit }, { shop, country }) {
     const selectedSuppliersWithRates = cartPricing?.shipping?.suppliersWithRates;
-    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates);
+    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates, country);
     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 }) {
+  async selectRate({ state: { cartPricing, entities, suburb, coupon }, commit }, { supplier, rate, shop, country }) {
     const suppliersWithRates = cartPricing.shipping.suppliersWithRates
       .map(supplierWithRates => ({
         ...(
@@ -190,7 +190,7 @@ export const actions = {
               })
             : supplierWithRates)
       }));
-    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon);
+    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, null, country);
     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) {
+function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, selectedSuppliersWithRates, country) {
   const getSimpleObj = i => i && ({ _id: i._id, name: i.name });
   return {
     entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
@@ -285,6 +285,7 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon
     address: suburb ? [suburb.locality, suburb.state, suburb.postcode].filter(i => !!i).join(', ') : null,
     coupon,
     suppliersWithRates,
-    selectedSuppliersWithRates
+    selectedSuppliersWithRates,
+    country: country?._id
   };
 }

package/store/index.js

@@ -35,6 +35,7 @@ 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 || {}
@@ -55,14 +56,15 @@ 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);
+      const countrySetting = (countrySettings?.settings || []).find(s => !!s.settings.app.STRIPE_PUBLIC_KEY);
       if (countrySetting) {
         commit('setPayment', {
           type: 'stripe',
@@ -71,6 +73,13 @@ 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) {
@@ -99,7 +108,7 @@ export const actions = {
             commit('cart/setCoupon', coupon);
           } catch (e) {}
         }
-        dispatch('cart/calculateCartPrice', { shop });
+        dispatch('cart/calculateCartPrice', { shop, country });
       }
     }
     const closedNotification = localStorage.getItem(CLOSED_NOTIFICATION);
@@ -121,15 +130,17 @@ 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, pricing, notificationBar, discountPopup, order, depositInfo }) {
+  setSettings(state, { contacts, notificationBar, discountPopup, order, depositInfo }) {
     state.contacts = contacts;
-    state.pricing = pricing;
     state.orderInfo = order;
     state.notificationBar = notificationBar;
     state.discountPopup = discountPopup;

package/store/product.js

@@ -161,6 +161,7 @@ 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 +201,10 @@ export const actions = {
   async updatePriceIncludeGST({ commit }, value) {
     commit('setPriceIncludeGST', value);
   },
-  async calculateProductPrice({ state: { template, product, isPrintPricing }, commit, getters }, shop) {
+  async calculateProductPrice({ state: { template, product, isPrintPricing }, commit, getters }, { shop, country }) {
     commit('setCalculatingPrice', true);
     const entities = getProductsForCalculatePricing(product, getters.usedSimpleProducts, template.layers, isPrintPricing, true);
-    const response = await api.calculateProductPrice({ entities }, shop._id);
+    const response = await api.calculateProductPrice({ entities, country: country?._id }, shop._id);
     commit('setProductPricing', response);
     commit('setCalculatingPrice', false);
   },