@lancom/shared 0.0.283 → 0.0.285

package/assets/scss/_common.scss

@@ -4,6 +4,11 @@ body {
   overflow-x: hidden;
 }
 
+.multiselect__spinner {
+  z-index: 2 !important;
+  top: 6px !important;
+}
+
 .content {
   width: 100%;
   margin-top: $navbar_height;

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

@@ -26,15 +26,15 @@
             <postcode-select
               :suburb="suburb"
               :labelless="true"
-              placeholder="Postcode"
-              label-text="Enter postcode to calculate shipping"
+              :placeholder="postcodeLabel"
+              :label-text="postcodeInfoLabel"
               @select="handleSuburbChange" />
           </div>
           <div class="Cart__coupon-container">
             <coupon-select
               v-model="cartCoupon"
               :pricing="cartPricingCalculating ? null : cartPricing"
-              label-text="Enter coupon code" />
+              :label-text="couponLabel" />
           </div>
           <div class="Cart__quantity-errors">
             <cart-quantity-errors />
@@ -91,14 +91,24 @@ export default {
   filters: { price },
   mixins: [CartMixin],
   computed: {
+    ...mapGetters(['MESSAGES']),
     ...mapGetters('cart', ['isEmpty', 'cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities']),
+    postcodeLabel() {
+      return this.MESSAGES.CART_POSTCODE || 'Postcode';
+    },
+    postcodeInfoLabel() {
+      return this.MESSAGES.CART_POSTCODE_INFO || 'Enter postcode to calculate shipping';
+    },
+    couponLabel() {
+      return (this.MESSAGES.CART_COUPON || 'Coupon code').trim();
+    },
     cartCoupon: {
       get() {
         return this.coupon;
       },
       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.scss

@@ -14,20 +14,4 @@
       }
     }
   }
-}
-
-.CustomerAddressForm {
-  &__toggle-address {
-    margin-bottom: 10px;
-    cursor: pointer;
-    display: inline-block;
-    color: $green;
-    border-bottom: 1px dashed $green;
-  }
-  &__section {
-    padding: 15px;
-    border: 1px solid #d7d7d7;
-    margin-bottom: 10px;
-    border-radius: 4px;
-  }
 }

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

@@ -1,6 +1,6 @@
 <template>
   <div class="CustomerAddressForm__wrapper">
-    <div class="CustomerAddressForm__form CustomerAddressForm__section">
+    <div class="CustomerAddressForm__form">
       <div class="form-row--cols">
         <validation-provider
           v-slot="{ errors }"
@@ -124,16 +124,74 @@
           </span>
         </validation-provider>
       </div>
-    </div>
-    <div class="CustomerAddressForm__section">
+      <validation-provider
+        v-slot="{ errors }"
+        tag="div"
+        name="Address line 1"
+        rules="required"
+        class="form-row">
+        <label
+          for="addressLine1"
+          class="form-label">
+          Address line 1
+        </label>
+        <input
+          id="addressLine1"
+          ref="addressLine1"
+          v-model="address.addressLine1"
+          name="addressLine1"
+          type="text"
+          class="form-field labelless"
+          placeholder="Address line 1"
+          :class="{
+            'is-danger': errors.length,
+            filled: address.addressLine1
+          }"
+          @input="validateAddress"
+          @keyup.enter="$refs.addressLine1.focus()" />
+        <span
+          v-if="errors.length"
+          class="form-help is-danger">
+          {{ errors[0] }}
+        </span>
+      </validation-provider>
+      <validation-provider
+        v-slot="{ errors }"
+        tag="div"
+        name="Address line 2"
+        class="form-row">
+        <label
+          for="addressLine2"
+          class="form-label">
+          Address line 2
+        </label>
+        <input
+          id="addressLine2"
+          ref="addressLine2"
+          v-model="address.addressLine2"
+          name="addressLine2"
+          type="text"
+          class="form-field labelless"
+          placeholder="Address line 2"
+          :class="{
+            'is-danger': errors.length,
+            filled: address.addressLine2
+          }"
+          @input="validateAddress"
+          @keyup.enter="$refs.addressLine2.focus()" />
+        <span
+          v-if="errors.length"
+          class="form-help is-danger">
+          {{ errors[0] }}
+        </span>
+      </validation-provider>
       <div class="form-row--cols">
         <postcode-select
-          v-if="!visibleFullAddress"
           class="form-col col-half"
           :suburb="suburb"
           :labelless="true"
           :required="true"
-          :placeholder="postcodeLabel"
+          placeholder="Suburb"
           @select="handleSuburbChange">
         </postcode-select>
         <div class="form-col col-half">
@@ -152,190 +210,36 @@
             disabled />
         </div>
       </div>
-      <div
-        @click="visibleFullAddress = !visibleFullAddress"
-        class="CustomerAddressForm__toggle-address">
-        {{ visibleFullAddress ? 'Find a Different Address' : 'Enter Address Manually' }}
-      </div>
-      <div v-if="visibleFullAddress">
-        <validation-provider
-          v-slot="{ errors }"
-          tag="div"
-          name="Address line 1"
-          rules="required"
-          class="form-row">
-          <label
-            for="addressLine1"
-            class="form-label">
-            Address line 1
-          </label>
-          <input
-            id="addressLine1"
-            ref="addressLine1"
-            v-model="address.addressLine1"
-            name="addressLine1"
-            type="text"
-            class="form-field labelless"
-            placeholder="Address line 1"
-            :class="{
-              'is-danger': errors.length,
-              filled: address.addressLine1
-            }"
-            @input="validateAddress"
-            @keyup.enter="$refs.addressLine1.focus()" />
-          <span
-            v-if="errors.length"
-            class="form-help is-danger">
-            {{ errors[0] }}
-          </span>
-        </validation-provider>
-        <validation-provider
-          v-slot="{ errors }"
-          tag="div"
-          name="Address line 2"
-          class="form-row">
-          <label
-            for="addressLine2"
-            class="form-label">
-            Address line 2
-          </label>
-          <input
-            id="addressLine2"
-            ref="addressLine2"
-            v-model="address.addressLine2"
-            name="addressLine2"
-            type="text"
-            class="form-field labelless"
-            placeholder="Address line 2"
-            :class="{
-              'is-danger': errors.length,
-              filled: address.addressLine2
-            }"
-            @input="validateAddress"
-            @keyup.enter="$refs.addressLine2.focus()" />
-          <span
-            v-if="errors.length"
-            class="form-help is-danger">
-            {{ errors[0] }}
-          </span>
-        </validation-provider>
-        <validation-provider
-          v-if="!withoutAdditionalInfo"
-          v-slot="{ errors }"
-          tag="div"
+      <validation-provider
+        v-if="!withoutAdditionalInfo"
+        v-slot="{ errors }"
+        tag="div"
+        name="additionalInfo"
+        class="form-row">
+        <label
+          for="additionalInfo"
+          class="form-label">
+          Additional Info
+        </label>
+        <input
+          id="additionalInfo"
+          ref="additionalInfo"
+          v-model="address.additionalInfo"
           name="additionalInfo"
-          class="form-row">
-          <label
-            for="additionalInfo"
-            class="form-label">
-            Additional Info
-          </label>
-          <input
-            id="additionalInfo"
-            ref="additionalInfo"
-            v-model="address.additionalInfo"
-            name="additionalInfo"
-            placeholder="Additional Info"
-            type="text"
-            class="form-field labelless"
-            :class="{
-              'is-danger': errors.length,
-              filled: address.additionalInfo
-            }"
-            @keyup.enter="$refs.additionalInfo.focus()" />
-          <span
-            v-if="errors.length"
-            class="form-help is-danger">
-            {{ errors[0] }}
-          </span>
-        </validation-provider>
-        <div class="form-row--cols">
-          <validation-provider
-            v-slot="{ errors }"
-            tag="div"
-            name="postcode"
-            class="form-col">
-            <label
-              for="postcode"
-              class="form-label">
-              Postcode
-            </label>
-            <input
-              id="postcode"
-              ref="postcode"
-              v-model="address.postcode"
-              name="postcode"
-              placeholder="Postcode"
-              type="text"
-              class="form-field labelless"
-              :class="{
-                'is-danger': errors.length,
-                filled: address.postcode
-              }" />
-            <span
-              v-if="errors.length"
-              class="form-help is-danger">
-              {{ errors[0] }}
-            </span>
-          </validation-provider>
-          <validation-provider
-            v-slot="{ errors }"
-            tag="div"
-            :name="localityLabel"
-            class="form-col">
-            <label
-              for="locality"
-              class="form-label">
-              {{ localityLabel }}
-            </label>
-            <input
-              id="locality"
-              ref="locality"
-              v-model="address.city"
-              name="locality"
-              :placeholder="localityLabel"
-              type="text"
-              class="form-field labelless"
-              :class="{
-                'is-danger': errors.length,
-                filled: address.city
-              }" />
-            <span
-              v-if="errors.length"
-              class="form-help is-danger">
-              {{ errors[0] }}
-            </span>
-          </validation-provider>
-          <validation-provider
-            v-slot="{ errors }"
-            tag="div"
-            :name="stateLabel"
-            class="form-col">
-            <label
-              for="state"
-              class="form-label">
-              {{ stateLabel }}
-            </label>
-            <input
-              id="state"
-              ref="state"
-              v-model="address.state"
-              name="state"
-              :placeholder="stateLabel"
-              type="text"
-              class="form-field labelless"
-              :class="{
-                'is-danger': errors.length,
-                filled: address.state
-              }" />
-            <span
-              v-if="errors.length"
-              class="form-help is-danger">
-              {{ errors[0] }}
-            </span>
-          </validation-provider>
-        </div>
-      </div>
+          placeholder="Additional Info"
+          type="text"
+          class="form-field labelless"
+          :class="{
+            'is-danger': errors.length,
+            filled: address.additionalInfo
+          }"
+          @keyup.enter="$refs.additionalInfo.focus()" />
+        <span
+          v-if="errors.length"
+          class="form-help is-danger">
+          {{ errors[0] }}
+        </span>
+      </validation-provider>
     </div>
   </div>
 </template>
@@ -349,11 +253,6 @@ export default {
   components: {
     PostcodeSelect
   },
-  data() {
-    return {
-      visibleFullAddress: false
-    };
-  },
   props: {
     address: {
       type: Object,
@@ -365,22 +264,13 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['shop', 'country', 'MESSAGES']),
+    ...mapGetters(['shop', 'country']),
     ...mapGetters('cart', [
       'suburb'
     ]),
     ...mapGetters('auth', [
       'user'
-    ]),
-    postcodeLabel() {
-      return this.MESSAGES?.POSTCODES_LABEL || 'Suburb';
-    },
-    localityLabel() {
-      return this.MESSAGES?.LOCALITY || 'Locality';
-    },
-    stateLabel() {
-      return this.MESSAGES?.STATE || 'State';
-    }
+    ])
   },
   created() {
     if (!this.address.suburb && !this.suburb &&  this.user?.suburb) {
@@ -407,16 +297,9 @@ export default {
         this.$set(this.address, 'postcode', suburb.postcode);
         this.$set(this.address, 'city', suburb.locality);
         this.$set(this.address, 'country', suburb.country);
-        if (suburb.addressLine1) {
-          this.$set(this.address, 'addressLine1', suburb.addressLine1);
-        }
-        if (suburb.addressLine2) {
-          this.$set(this.address, 'addressLine2', suburb.addressLine2);
-        }
       }
     },
     handleSuburbChange(suburb) {
-      this.visibleFullAddress = true;
       this.setAddressSuburb(suburb);
       this.setSuburb(suburb);
       this.calculateCartPrice({ shop: this.shop, country: this.country });
@@ -427,4 +310,4 @@ export default {
 
 <style lang="scss" scoped>
 @import 'address-form.scss';
-</style>
+</style>

package/components/checkout/order/order-billing-information/order-billing-information.vue

@@ -29,7 +29,7 @@ import gtm from '@lancom/shared/assets/js/utils/gtm';
 import { generateOrderData } from '@lancom/shared/assets/js/utils/order';
 import CartQuantityErrors from '@lancom/shared/components/checkout/cart/cart_quantity_errors/cart-quantity-errors';
 import CartMixin from '@lancom/shared/components/checkout/cart/cart.mixin';
-import AddressForm from '@lancom/shared/components/checkout/order/address-form/address-form';
+import AddressForm from '@/components/checkout/order/address-form/address-form';
 import ProgressStepsControls from '@lancom/shared/components/common/progress_steps/progress_steps_controls/progress-steps-controls';
 
 export default {

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

@@ -19,7 +19,7 @@
 
 <script>
 import { mapMutations } from 'vuex';
-import AddressForm from '@lancom/shared/components/checkout/order/address-form/address-form';
+import AddressForm from '@/components/checkout/order/address-form/address-form';
 import ProgressStepsControls from '@lancom/shared/components/common/progress_steps/progress_steps_controls/progress-steps-controls';
 
 export default {

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/common/coupon_select/coupon-select.vue

@@ -1,33 +1,37 @@
 <template>
-  <div class="CouponSelect__wrapper form-row">
+  <div class="CouponSelect__wrapper">
     <validation-provider
       tag="div"
       name="coupon"
       class="form-col col-half">
-      <label
-        for="coupon"
-        class="form-label">
-        {{ labelText }}
-      </label>
       <div class="row">
         <div class="col-7">
-          <input
-            id="coupon"
-            ref="coupon"
-            v-model="code"
-            placeholder="Coupon"
-            name="coupon"
-            type="text"
-            class="form-field labelless"
-            :class="{
-              'is-danger': code && notValidCoupon,
-              filled: code
-            }"
-            @keydown.enter="validateCoupon" />
-          <span
-            v-if="value"
-            class="CouponSelect__clear"
-            @click="clearCoupon()">remove coupon</span>
+          <div class="form-row">
+            <input
+              id="coupon"
+              ref="coupon"
+              v-model="code"
+              placeholder="Coupon"
+              name="coupon"
+              type="text"
+              class="form-field"
+              :class="{
+                'is-danger': code && notValidCoupon,
+                filled: code
+              }"
+              @keydown.enter="validateCoupon" />
+            <label
+              v-if="labelText"
+              for="coupon"
+              class="form-label label-inner"
+              style="color: #999 !important;">
+              {{ labelText }}
+            </label>
+            <span
+              v-if="value"
+              class="CouponSelect__clear"
+              @click="clearCoupon()">remove coupon</span>
+          </div>
         </div>
         <div class="col-5">
           <btn

package/components/common/postcode_select/postcode-select.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="PostcodeSelect">
+  <div class="PostcodeSelect form-row">
     <validation-provider
       v-slot="{ errors }"
       tag="div"
@@ -151,7 +151,7 @@ export default {
   },
   methods: {
     async handleSearch(query) {
-      if (query.trim().length > 2) {
+      if (query.trim().length > 1) {
         this.isLoading = true;
         const country = this.codeCountry || this.country;
         const countryName = country ? (country.isoCode === 'GB' ? 'England' : (country.name || country)) : 'Australia';

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.285",
   "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);
   },