@lancom/shared 0.0.283 → 0.0.284

package/components/checkout/cart/cart.mixin.js

@@ -65,11 +65,11 @@ export default {
     ]),
     handleSuburbChange(suburb) {
       this.setSuburb(suburb);
-      this.calculateCartPrice({ shop: this.shop, country: this.country });
+      this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
     },
     handleCouponChange(coupon) {
       this.setCoupon(coupon);
-      this.calculateCartPrice({ shop: this.shop, country: this.country });
+      this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
     },
     async removeSimpleProducts(simpleProducts) {
       const message = 'This will delete all items in this row, Press OK to continue or Cancel';

package/components/checkout/cart/cart.vue

@@ -98,7 +98,7 @@ export default {
       },
       set(coupon) {
         this.setCoupon(coupon);
-        this.calculateCartPrice({ shop: this.shop, country: this.country });
+        this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
       }
     }
   },

package/components/checkout/cart/cart_price_info/cart-price-info.vue

@@ -40,7 +40,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country']),
+    ...mapGetters(['shop', 'country', 'currency']),
     ...mapGetters('cart', [
       'entities',
       'cartPricing',
@@ -61,7 +61,7 @@ export default {
       'calculateCartPrice'
     ]),
     async calculatePrice() {
-      await this.calculateCartPrice({ shop: this.shop, country: this.country });
+      await this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
     }
   }
 };

package/components/checkout/cart/cart_shipments_pricing/cart-shipments-pricing.vue

@@ -33,7 +33,7 @@
           :class="{
             'CartShipmentsPricing__rate--disabled': rate.disabled
           }"
-          @click="selectRate({ supplier, rate, shop, country })">
+          @click="selectRate({ supplier, rate, shop, country, currency })">
           <div class="CartShipmentsPricing__rate-info">
             <div class="CartShipmentsPricing__rate-icon">
               <checked-icon :checked="rate.selected" />

package/components/checkout/order/address-form/address-form.vue

@@ -365,7 +365,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['shop', 'country', 'MESSAGES']),
+    ...mapGetters(['shop', 'country', 'currency', 'MESSAGES']),
     ...mapGetters('cart', [
       'suburb'
     ]),
@@ -419,7 +419,7 @@ export default {
       this.visibleFullAddress = true;
       this.setAddressSuburb(suburb);
       this.setSuburb(suburb);
-      this.calculateCartPrice({ shop: this.shop, country: this.country });
+      this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
     }
   }
 };

package/components/checkout/order/order-shipping-method/order-shipping-method.vue

@@ -45,7 +45,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country']),
+    ...mapGetters(['shop', 'country', 'currency']),
     ...mapGetters('cart', ['cartPricing']),
     shippingPricing() {
       return this.cartPricing?.shipping;
@@ -53,7 +53,7 @@ export default {
   },
   mounted() {
     if (!this.shippingPricing) {
-      this.calculateCartPrice({ shop: this.shop, country: this.country });
+      this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
     }
   },
   methods: {

package/components/editor/editor_pricing/editor-pricing.vue

@@ -116,11 +116,11 @@ export default {
     return {
       price: null,
       showDetails: false,
-      calculatePriceWithDebounce: debounce(() => this.calculateProductPrice({ shop: this.shop, country: this.country }), 500)
+      calculatePriceWithDebounce: debounce(() => this.calculateProductPrice({ shop: this.shop, country: this.country, currency: this.currency }), 500)
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country']),
+    ...mapGetters(['shop', 'country', 'currency']),
     ...mapGetters('product', [
       'defaultSimpleProduct',
       'usedSimpleProducts',

package/components/editor/editor_print_area_options/editor-print-area-options.vue

@@ -12,10 +12,7 @@
       <editor-print-area-option
         :option="option"
         :product="product"
-        :selected="
-          (option.printArea && option.printArea._id === selected) ||
-            (option.suboptions && option.printArea && option.printArea._id === selected)
-        "
+        :selected="option.printArea && option.printArea._id === selected"
         @select="select"
         @option-mouseover="$emit('option-mouseover', $event)"
         @option-mouseleave="$emit('option-mouseleave', $event)" />
@@ -52,41 +49,33 @@ export default {
       default: false
     }
   },
-  data() {
-    return {
-      options: []
-    };
-  },
-  watch: {
-    side() {
-      this.updateOptions();
+  computed: {
+    options() {
+      const groupItemToOption = printArea => ({ printArea, label: printArea.name, size: printArea.printSize.alias });
+      const productsOptions = (this.product.printAreas || [])
+        .map(printArea => {
+          const mainOption = { ...groupItemToOption(printArea), sides: [printArea.side] };
+          const suboptions = [
+            mainOption,
+            ...(printArea.sizes || []).map(i => ({ ...groupItemToOption({ ...i, side: printArea.side }), sides: [printArea.side] }))
+          ];
+          return {
+            ...(suboptions.find(s => s.printArea?._id === this.selected) || mainOption),
+            suboptions
+          };
+        });
+      const options = productsOptions.filter(({ sides }) => sides.includes(this.side));
+      return this.allowNoPrint ? [...options, { label: 'No Print' }] : options;
     }
   },
   mounted() {
-    this.updateOptions();
+    if (!this.selected) {
+      this.select(this.options[0]);
+    }
   },
   methods: {
-    updateOptions() {
-      const productsOptions = this.getProductOptions();
-      const options = productsOptions.filter(({ sides }) => sides.includes(this.side));
-      this.options = this.allowNoPrint ? [...options, { label: 'No Print' }] : options;
-
-      this.select(this.options[0]);
-    },
     select(option) {
       this.$emit('select', option);
-    },
-    getProductOptions() {
-      const groupItemToOption = printArea => ({ printArea, label: printArea.name, size: printArea.printSize.alias });
-      return (this.product.printAreas || [])
-        .map(printArea => ({
-          ...groupItemToOption(printArea),
-          sides: [printArea.side],
-          suboptions: [
-            { ...groupItemToOption(printArea), sides: [printArea.side] },
-            ...(printArea.sizes || []).map(i => ({ ...groupItemToOption(i), sides: [printArea.side] }))
-          ]
-        }));
     }
   }
 };

package/components/editor/editor_workspace/editor-workspace.vue

@@ -93,7 +93,7 @@
         v-if="productDetailsLoaded"
         ref="areaOptions"
         :product="product"
-        :selected="selectedPrintArea && selectedPrintArea._id"
+        :selected="editablePrintArea && editablePrintArea._id"
         :side="editableSide.id"
         @select="selectPrintArea"
         @option-mouseover="toogleBoundBox(true, $event)"

package/components/modals/order_modal/order-modal.vue

@@ -347,7 +347,7 @@ export default {
       this.form.suburb = suburb;
       this.setAddressSuburb(suburb);
       this.setSuburb(suburb);
-      this.calculateCartPrice({ shop: this.shop, country: this.country });
+      this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
     },
     back() {
       this.switchModal('showCartModal');

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

@@ -139,7 +139,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country', 'taxName']),
+    ...mapGetters(['shop', 'country', 'currency', '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, country: this.country?._id }, this.shop._id);
+      this.productPricing = await api.calculateProductPrice({ entities, country: this.country?._id, currency: this.currency?._id }, this.shop._id);
     },
     generateSidesPrints() {
       return this.sides

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

@@ -216,7 +216,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country']),
+    ...mapGetters(['shop', 'country', 'currency']),
     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, country: this.country?._id }, this.shop._id);
+          const pricing = await api.calculateProductPrice({ entities, postcode: this.postcode, country: this.country?._id, currency: this.currency?._id }, this.shop._id);
           return { pricing, prints, type };
         })
       );

package/components/product/editor_pricing/editor-pricing.vue

@@ -119,7 +119,7 @@ export default {
     return {
       price: null,
       showDetails: false,
-      calculatePriceWithDebounce: debounce(() => this.calculateProductPrice({ shop: this.shop, country: this.country }), 500)
+      calculatePriceWithDebounce: debounce(() => this.calculateProductPrice({ shop: this.shop, country: this.country, currency: this.currency }), 500)
     };
   },
   props: {

package/feeds/google-shopping.js

@@ -58,7 +58,7 @@ async function googleShoppingFeed(axios, config, availableStores, country) {
                 'g:id': { _text: sp.SKU },
                 'g:item_group_id': { _text: product.SKU },
                 'g:size': { _text: sp.size.name },
-                'g:size_system': 'AU',
+                'g:size_system': country || 'AU',
                 'g:size_type': 'regular',
                 'g:gender': { _text: product.gender },
                 'g:material': { _text: product.fabricInfoShort },
@@ -68,7 +68,7 @@ async function googleShoppingFeed(axios, config, availableStores, country) {
                 'g:color': { _text: sp.color.name },
                 'g:image_link': { _text: sp.image || image },
                 'g:additional_image_link': (sp.image ? [image, ...images] : images).map(i => ({ _text: i })),
-                'g:price': { _text: `${(sp.price || 0)} ${sp.currency || 'AUD'}` },
+                'g:price': { _text: `${(sp.price || 0)} ${sp.currencyCode || 'AUD'}` },
                 'g:availability': { _text: sp.quantityStock > 0 ? 'in_stock' : 'out_of_stock' },
                 'g:google_product_category': { _text: product.feedGoogleProductCategory || 2047 },
                 'g:product_type': { _text: product.feedProductType || `Home > Products > ${product.productType.name}`, },

package/mixins/add-to-cart.js

@@ -52,7 +52,7 @@ export default {
 
       this.clearTemplate(true);
 
-      this.calculateCartPrice({ shop: this.shop, country: this.country });
+      this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
 
       // this.resetLayers();
       // this.setIsPrintPricing(false);

package/mixins/products-price.js

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

package/package.json

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

package/store/cart.js

@@ -153,9 +153,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, country, currency }) {
     const selectedSuppliersWithRates = cartPricing?.shipping?.suppliersWithRates;
-    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates, country);
+    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates, country, currency);
     console.log('calculateCartPrice:payload: ', payload)
     try {
       commit('setCartPricingCalculating', true);
@@ -186,7 +186,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, country, currency }) {
     const suppliersWithRates = cartPricing.shipping.suppliersWithRates
       .map(supplierWithRates => ({
         ...(
@@ -197,7 +197,7 @@ export const actions = {
               })
             : supplierWithRates)
       }));
-    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, null, country);
+    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, null, country, currency);
     try {
       commit('setCartPricingCalculating', true);
       const response = await api.calculateProductPrice(payload, shop._id);
@@ -254,7 +254,7 @@ export const mutations = {
   }
 };
 
-function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, selectedSuppliersWithRates, country) {
+function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, selectedSuppliersWithRates, country, currency) {
   const getSimpleObj = i => i && ({ _id: i._id, name: i.name });
   return {
     entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
@@ -295,6 +295,7 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon
     coupon,
     suppliersWithRates,
     selectedSuppliersWithRates,
-    country: country?._id
+    country: country?._id,
+    currency: currency?._id
   };
 }

package/store/product.js

@@ -201,10 +201,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, country, currency }) {
     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, country: country?._id, currency: currency?._id }, shop._id);
     commit('setProductPricing', response);
     commit('setCalculatingPrice', false);
   },