@lancom/shared 0.0.267 → 0.0.268

package/components/order/order_prints_groups/order-prints-groups.vue

@@ -51,7 +51,7 @@
               <td>{{ total.price | price(currency) }}</td>
             </tr>
             <tr v-if="totalsWithGst">
-              <td>Total inc. GST</td>
+              <td>Total inc. {{ taxName }}</td>
               <td colspan="3"></td>
               <td>{{ total.amount }}</td>
               <td></td>
@@ -65,6 +65,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import ProductSideWithPrint from '@lancom/shared/components/common/product_side_with_print/product-side-with-print';
 import { COLORS_IMAGES_TYPES } from '@lancom/shared/assets/js/constants/colors';
 import { groupProductsByPrints } from '@lancom/shared/assets/js/utils/products-grouping';
@@ -94,6 +95,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['taxName']),
     printsGroups() {
       return groupProductsByPrints(this.order.products, this.order.price.products);
     },

package/components/order/order_products_groups/order-products-groups.vue

@@ -40,7 +40,7 @@
               <td>{{ total.price | price(currency) }}</td>
             </tr>
             <tr v-if="totalsWithGst">
-              <td>Total inc. GST</td>
+              <td>Total inc. {{ taxName }}</td>
               <td colspan="3"></td>
               <td>{{ total.amount }}</td>
               <td>{{ total.prints.amount }}</td>
@@ -59,6 +59,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import { print, price } from '@lancom/shared/assets/js/utils/filters';
 import { groupProductsByDesign } from '@lancom/shared/assets/js/utils/products-grouping';
 import OrderProductsGroup from './order_products_group/order-products-group';
@@ -91,6 +92,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['taxName']),
     productsGroups() {
       return groupProductsByDesign(this.order.products, this.order.price.products);
     },

package/components/order/order_refund_view/order-refund-view.vue

@@ -88,13 +88,13 @@
             'OrderRefundView__totals--paid': isPaid
           }">
           <div class="lc_regular16">
-            Total ex GST: <b>{{ refund.total | price(currency) }}</b>
+            Total ex {{ taxName }}: <b>{{ refund.total | price(currency) }}</b>
           </div>
           <div class="lc_regular16">
-            GST: <b>{{ refund.totalGST - refund.total | price(currency) }}</b>
+            {{ taxName }}: <b>{{ refund.totalGST - refund.total | price(currency) }}</b>
           </div>
           <div class="lc_regular16">
-            Total inc GST: <b>{{ refund.totalGST | price(currency) }}</b>
+            Total inc {{ taxName }}: <b>{{ refund.totalGST | price(currency) }}</b>
           </div>
         </div>
       </div>
@@ -103,6 +103,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import OrderViewMixin from './../order_view/order-view.mixin';
 import OrderViewProduct from './../order_view/order_view_product/order-view-product';
 
@@ -123,6 +124,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['taxName']),
     isPaid() {
       return this.refund.status === 'refunded';
     },

package/components/order/order_setup_groups/order-setup-groups.vue

@@ -12,8 +12,8 @@
               <th>SKU</th>
               <th>Quantity</th>
               <th>Price</th>
-              <th>GST</th>
-              <th>Total Inc. GST</th>
+              <th>{{ taxName }}</th>
+              <th>Total Inc. {{ taxName }}</th>
             </tr>
           </thead>
           <tbody class="centered">
@@ -46,6 +46,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import { COLORS_IMAGES_TYPES } from '@lancom/shared/assets/js/constants/colors';
 import { groupProductsByPrints } from '@lancom/shared/assets/js/utils/products-grouping';
 import { price, print } from '@lancom/shared/assets/js/utils/filters';
@@ -67,6 +68,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['taxName']),
     printsGroups() {
       return groupProductsByPrints(this.order.products, this.order.price.products);
     },

package/components/order/order_sku_groups/order-sku-groups.vue

@@ -49,7 +49,7 @@
               </td>
             </tr>
             <tr v-if="totalsWithGst">
-              <td> Total inc. GST</td>
+              <td> Total inc. {{ taxName }}</td>
               <td colspan="3"></td>
               <td>{{ total.amount }}</td>
               <td></td>
@@ -68,6 +68,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import { groupProductsBySKU } from '@lancom/shared/assets/js/utils/products-grouping';
 import { price } from '@lancom/shared/assets/js/utils/filters';
 import { copyToClipboard } from '@lancom/shared/assets/js/utils/copy-to-clipboard';
@@ -96,6 +97,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['taxName']),
     featureGroups() {
       return groupProductsBySKU(this.order.products, this.order.price.products);
     },

package/components/order/order_view/order-view.vue

@@ -127,10 +127,10 @@
               Shipping Total: <b>{{ model.shippingTotal | price(order.currency) }}</b>
             </div>
             <div class="lc_regular16">
-              Total ex GST: <b>{{ (model.total + couponTotal) | price(order.currency) }}</b>
+              Total ex {{ taxName }}: <b>{{ (model.total + couponTotal) | price(order.currency) }}</b>
             </div>
             <div class="lc_regular16">
-              GST: <b>{{ model.totalGST - model.total | price(order.currency) }}</b>
+              {{ taxName }}: <b>{{ model.totalGST - model.total | price(order.currency) }}</b>
             </div>
             <div
               v-if="!invoice && order.couponCode"
@@ -138,7 +138,7 @@
               Coupon: <b>{{ couponTotal | price(order.currency) }}</b>
             </div>
             <div class="lc_regular16">
-              Total inc GST: <b>{{ model.totalGST | price(order.currency) }}</b>
+              Total inc {{ taxName }}: <b>{{ model.totalGST | price(order.currency) }}</b>
             </div>
             <div class="lc_regular16">
               {{ isPaid ? 'Paid' : 'Pending Payment' }}: <b>{{ model.totalGST | price(order.currency) }}</b>
@@ -175,10 +175,10 @@
             Shipping Total: <b>{{ model.shippingTotal | price(order.currency) }}</b>
           </div>
           <div class="lc_regular16">
-            Total ex GST: <b>{{ (model.total + couponTotal) | price(order.currency) }}</b>
+            Total ex {{ taxName }}: <b>{{ (model.total + couponTotal) | price(order.currency) }}</b>
           </div>
           <div class="lc_regular16">
-            GST: <b>{{ model.totalGST - model.total | price(order.currency) }}</b>
+            {{ taxName }}: <b>{{ model.totalGST - model.total | price(order.currency) }}</b>
           </div>
           <div
             v-if="!invoice && order.couponCode"
@@ -186,7 +186,7 @@
             Coupon: <b>{{ couponTotal | price(order.currency) }}</b>
           </div>
           <div class="lc_regular16">
-            Total inc GST: <b>{{ model.totalGST | price(order.currency) }}</b>
+            Total inc {{ taxName }}: <b>{{ model.totalGST | price(order.currency) }}</b>
           </div>
           <div class="lc_regular16">
             {{ isPaid ? 'Paid' : 'Pending Payment' }}: <b>{{ model.totalGST | price(order.currency) }}</b>
@@ -198,6 +198,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import OrderViewMixin from './order-view.mixin';
 import OrderViewProduct from './order_view_product/order-view-product';
 
@@ -212,6 +213,9 @@ export default {
       type: Boolean,
       default: true
     }
+  },
+  computed: {
+    ...mapGetters(['taxName'])
   }
 };
 </script>

package/components/pricing/pricing_digital_printing/pricing-digital-printing.vue

@@ -205,7 +205,7 @@
                 v-if="isSelectedPrint"
                 class="form-row">
                 <span class="PricingMainSection__section-content-label">
-                  Inclusive of GST:
+                  Inclusive of {{ taxName }}:
                 </span>
                 <span class="PricingMainSection__section-content-value">
                   {{ productPricing.tax.totalPrice | price(currency) }}
@@ -225,6 +225,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import { PRODUCT_TYPES, PRODUCT_TYPES_LIST } from '@lancom/shared/assets/js/constants/product';
 import productsPrice from '@lancom/shared/mixins/products-price';
 import Range from '@lancom/shared/components/common/range/range';
@@ -254,6 +255,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters(['taxName']),
     productEditorLink() {
       return `/${this.product.SKU}/${this.product.alias}/editor`;
     },

package/components/pricing/pricing_example/pricing-example.vue

@@ -63,7 +63,7 @@
                         {{ productPricing.totalPrice | price(currency) }}
                       </div>
                       <div class="PricingExample__example-tax">
-                        Inclusive of GST: {{ productPricing.tax.totalPrice | price(currency) }}
+                        Inclusive of {{ taxName }}: {{ productPricing.tax.totalPrice | price(currency) }}
                       </div>
                       <div class="mt-10">
                         + Delivery
@@ -139,7 +139,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop']),
+    ...mapGetters(['shop', 'country', 'taxName']),
     printsPricing() {
       return this.productPricing?.products[this.product._id]?.prints.prints || [];
     }
@@ -152,7 +152,7 @@ export default {
       const prints = this.generateSidesPrints();
       const layers = prints.map(({ printType, printSize, printArea }) => ({ printType: printType?._id, printSize: printSize?._id, printArea: printArea?._id }));
       const entities = getProductsForCalculatePricing(this.product, [this.simpleProduct], layers, true, true);
-      this.productPricing = await api.calculateProductPrice({ entities }, this.shop._id);
+      this.productPricing = await api.calculateProductPrice({ entities, country: this.country?._id }, this.shop._id);
     },
     generateSidesPrints() {
       return this.sides

package/components/pricing/pricing_how_we_calculate/pricing-how-we-calculate.vue

@@ -76,7 +76,7 @@
               Your Total Price
             </div>
             <div class="PricingHowWeCalculate__entity-description">
-              (inclusive of GST)
+              (inclusive of {{ taxName }})
             </div>
           </div>
         </div>
@@ -86,8 +86,13 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+
 export default {
-  name: 'PricingHowWeCalculate'
+  name: 'PricingHowWeCalculate',
+  computed: {
+    ...mapGetters(['taxName'])
+  }
 };
 </script>
 

package/components/pricing/pricing_products_calculator/pricing_product_calculator/pricing-product-calculator.vue

@@ -216,7 +216,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop']),
+    ...mapGetters(['shop', 'country']),
     maxScreenPrintColors() {
       const printTypes = this.product.printTypes.filter(printType => printType.type === 'screen print');
       return Math.max(...printTypes.map(printType => printType.colorsQuantity));
@@ -262,7 +262,7 @@ export default {
           const prints = this.generateSidesPrints(type);
           const layers = prints.map(({ printType, printSize, printArea }) => ({ printType: printType?._id, printSize: printSize?._id, printArea: printArea?._id }));
           const entities = getProductsForCalculatePricing(this.product, [this.simpleProduct], layers, true, true);
-          const pricing = await api.calculateProductPrice({ entities, postcode: this.postcode }, this.shop._id);
+          const pricing = await api.calculateProductPrice({ entities, postcode: this.postcode, country: this.country?._id }, this.shop._id);
           return { pricing, prints, type };
         })
       );

package/components/pricing/pricing_screen_printing/pricing-screen-printing.vue

@@ -205,7 +205,7 @@
                 v-if="isSelectedPrint"
                 class="form-row">
                 <span class="PricingScreenPrintSection__section-content-label">
-                  Inclusive of GST:
+                  Inclusive of {{ taxName }}:
                 </span>
                 <span class="PricingScreenPrintSection__section-content-value">
                   {{ productPricing.tax.totalPrice | price(currency) }}
@@ -226,6 +226,7 @@
 
 <script>
 import Multiselect from 'vue-multiselect';
+import { mapGetters } from 'vuex';
 import { PRODUCT_TYPES, PRODUCT_TYPES_LIST } from '@lancom/shared/assets/js/constants/product';
 import productsPrice from '@lancom/shared/mixins/products-price';
 import Range from '@lancom/shared/components/common/range/range';
@@ -285,6 +286,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters(['taxName']),
     productEditorLink() {
       return `/${this.product.SKU}/${this.product.alias}/editor`;
     },

package/components/product/product_price_range/product-price-range.vue

@@ -10,12 +10,12 @@
         {{ product[minPriceAttr] | tax(gstTax) | price(currency) }}
         <span
           v-if="visiblePriceInfo"
-          class="lc_regular11 lc_bold">inc. GST</span>
+          class="lc_regular11 lc_bold">inc. {{ taxName }}</span>
       </div>
       <div
         v-if="withoutGst"
         :class="withGst ? 'lc_regular11' : 'lc_h4'">
-        {{ prePriceText }} {{ product[minPriceAttr] | price(currency) }} + GST
+        {{ prePriceText }} {{ product[minPriceAttr] | price(currency) }} + {{ taxName }}
       </div>
     </div>
     <div
@@ -27,12 +27,12 @@
         {{ product[minPriceAttr] | tax(gstTax) | price(currency) }} {{ rangeDivider }} {{ product[maxPriceAttr] | tax(gstTax) | price(currency) }}
         <span
           v-if="visiblePriceInfo"
-          class="lc_regular11 lc_bold"> inc. GST</span>
+          class="lc_regular11 lc_bold"> inc. {{ taxName }}</span>
       </div>
       <div
         v-if="withoutGst"
         :class="withGst ? 'lc_regular11' : 'lc_h4'">
-        {{ prePriceText }} {{ product[minPriceAttr] | price(currency) }} {{ rangeDivider }} {{ product[maxPriceAttr] | price(currency) }} + GST
+        {{ prePriceText }} {{ product[minPriceAttr] | price(currency) }} {{ rangeDivider }} {{ product[maxPriceAttr] | price(currency) }} + {{ taxName }}
       </div>
     </div>
   </div>
@@ -84,7 +84,8 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'gstTax'
+      'gstTax',
+      'taxName'
     ])
   }
 };

package/components/product/product_prints_price_info/product-prints-price-info.vue

@@ -4,7 +4,7 @@
       <checkbox
         v-model="inclGST"
         :dark="true">
-        <div class="ml-5">Inc. GST</div>
+        <div class="ml-5">Inc. {{ taxName }}</div>
       </checkbox>
     </div>
     <tabs
@@ -88,7 +88,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop']),
+    ...mapGetters(['shop', 'taxName']),
     ...mapGetters('product', ['priceIncludeGST']),
     ...mapGetters(['helpMessages']),
     hasPrintSurcharge() {

package/components/products/products_autocomplete/products-autocomplete.scss

@@ -10,20 +10,21 @@
     right: 0;
     top: 41px;
     padding: 10px;
-    background-color: $black;
-    color: $white;
+    background-color: white;
+    border: 1px solid $medium_gray;
+    z-index: 999;
   }
   &__result-item {
     padding-bottom: 10px;
     margin-bottom: 10px;
-    border-bottom: 1px solid $gray_main;
+    border-bottom: 1px solid $medium_gray;
     &:last-child {
       border-bottom: none;
       margin-bottom: 0px;
     }
     ::v-deep {
       a {
-        color: $white;
+        color: $gray_main;
         font-size: 13px;
         text-decoration: none;
       }
@@ -33,24 +34,22 @@
       padding: 10px;
       text-align: center;
       display: block;
-      background-color: $white;
+      background-color: $black;
+      color: $white !important;
       &:hover {
-        background-color: $black;
-        color: $white;
+        background-color: $white;
+        color: $black !important;
       }
     }
   }
   &__input {
     input {
-      background-color: #535353;
-      border: none;
+      border-color: $medium_gray;
       border-radius: 0px;
-      color: $white;
       height: 41px;
       position: relative;
       z-index: 1;
       &::placeholder {
-        font-weight: 600;
         font-size: 14px;
         color: $grey_3;
       }
@@ -61,7 +60,6 @@
       right: 10px;
       font-size: 17px;
       pointer-events: none;
-      color: $white;
       &.icon-search {
         z-index: 2;
         pointer-events: all;

package/components/quotes/quote_request/quote-request.vue

@@ -354,7 +354,7 @@ export default {
           email: '',
           phone: '',
           suburb: null,
-          country: 'Australia'
+          country: null
         },
         expectedItemsQuantity: null,
         description: '',

package/components/quotes/quote_view/quote_option_view/quote-option-view.vue

@@ -11,9 +11,9 @@
       <div>Products Total: <b>{{ option.productsTotal | price(currency) }}</b></div>
       <div>Prints Total: <b>{{ option.printsTotal | price(currency) }}</b></div>
       <div>Shipping Total: <b>{{ option.shippingTotal | price(currency) }}</b></div>
-      <div>Total ex GST: <b>{{ option.total | price(currency) }}</b></div>
-      <div>GST: <b>{{ optionGst(option) | price(currency) }}</b></div>
-      <div>Total inc GST: <b>{{ option.total | tax(gstTax) | price(currency) }}</b></div>
+      <div>Total ex {{ taxName }}: <b>{{ option.total | price(currency) }}</b></div>
+      <div>{{ taxName }}: <b>{{ optionGst(option) | price(currency) }}</b></div>
+      <div>Total inc {{ taxName }}: <b>{{ option.total | tax(gstTax) | price(currency) }}</b></div>
     </div>
   </div>
 </template>
@@ -40,7 +40,8 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'gstTax'
+      'gstTax',
+      'taxName'
     ])
   },
   methods: {

package/mixins/meta-info.js

@@ -34,7 +34,10 @@ const metaInfo = {
     }
   },
   head() {
-    const hasQueryParams = Object.keys(this.$route.query || {}).length > 0;
+    const hasQueryParams = Object
+      .keys(this.$route.query || {})
+      .filter(key => !['color', 'store'].includes(`${key || ''}`.toLowerCase()))
+      .length > 0;
 
     const { short_text: shortText, image, meta = {} } = this.routeInfo || {};
     const pageItemMeta = this.pageItem?.meta || {};

package/mixins/products-price.js

@@ -22,7 +22,7 @@ const productsPrice = {
     };
   },
   computed: {
-    ...mapGetters(['pricingSettings', 'shop']),
+    ...mapGetters(['pricingSettings', 'shop', 'country']),
     printsPricing() {
       const pricing = {};
       if (this.productPricing) {
@@ -72,7 +72,8 @@ const productsPrice = {
       const playload = {
         products: this.calcProducts,
         postcode: this.postcode,
-        screenPrint: this.screenPrint
+        screenPrint: this.screenPrint,
+        country: this.country?._id
       };
       this.productPricing = await api.calculateProductPrice(playload, this.shop._id);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.267",
+  "version": "0.0.268",
   "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 }) {
+  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);
   },