@lancom/shared 0.0.261 → 0.0.263

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

@@ -127,11 +127,11 @@
             {{ errors[0] }}
           </span>
         </validation-provider>
-        <div v-if="suburb" class="form-row">
+        <div class="form-row">
           <input
             id="country"
             ref="country"
-            :value="suburb.country"
+            value="Only Australia"
             name="country"
             type="country"
             class="form-field filled labelless"
@@ -303,9 +303,6 @@ export default {
   mounted() {
     if (this.orderData) {
       this.form = {
-        state: null,
-        country: null,
-        postcode: null,
         city: this.orderData.city,
         phone: this.orderData.phone,
         addressLine1: this.orderData.addressLine1,
@@ -328,27 +325,16 @@ export default {
     ...mapActions('cart', [
       'calculateCartPrice'
     ]),
-    setAddressSuburb(suburb) {
-      this.$set(this.form, 'suburb', suburb);
-      if (suburb) {
-        this.$set(this.form, 'state', suburb.state);
-        this.$set(this.form, 'postcode', suburb.postcode);
-        this.$set(this.form, 'city', suburb.locality);
-        this.$set(this.form, 'country', suburb.country);
-      }
-    },
     handleSuburbChange(suburb) {
       this.form.suburb = suburb;
-      this.setAddressSuburb(suburb);
       this.setSuburb(suburb);
-      this.calculateCartPrice({ shop: this.shop, country: this.country });
+      this.calculateCartPrice({ shop: this.shop });
     },
     back() {
       this.switchModal('showCartModal');
     },
     async submit() {
       try {
-        debugger;
         this.processing = true;
         const recaptchaToken = await this.getRecaptcha('create_order');
         await this.createOrder({

package/components/order/order_price/order-price.vue

@@ -25,20 +25,19 @@
         <b>Delivery:</b> {{ price.shipping.totalPriceWithoutTax | price(currency) }} ({{ price.shipping.weight }})
       </div>
       <div class="lc_caption OrderPrice__row">
-        <b>Order amount ex {{ taxName }}:</b> {{ price.totalPriceWithoutTax | price(currency) }}
+        <b>Order amount ex GST:</b> {{ price.totalPriceWithoutTax | price(currency) }}
       </div>
       <div class="lc_caption OrderPrice__row">
-        <b>{{ taxName }}:</b> {{ price.tax.totalPrice | price(currency) }} ({{ price.tax.percent }})
+        <b>GST:</b> {{ price.tax.totalPrice | price(currency) }} ({{ price.tax.percent }})
       </div>
       <div class="lc_caption OrderPrice__row">
-        <b>Order amount inc {{ taxName }}:</b> {{ price.totalPrice | price(currency) }}
+        <b>Order amount inc GST:</b> {{ price.totalPrice | price(currency) }}
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
 import { groupProductsPrintsBySize } from '@lancom/shared/assets/js/utils/products-grouping';
 import { price, print } from '@lancom/shared/assets/js/utils/filters';
 
@@ -52,7 +51,6 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['taxName']),
     price() {
       return this.order.price;
     },

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. {{ taxName }}</td>
+              <td>Total inc. GST</td>
               <td colspan="3"></td>
               <td>{{ total.amount }}</td>
               <td></td>
@@ -65,7 +65,6 @@
 </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';
@@ -95,7 +94,6 @@ 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. {{ taxName }}</td>
+              <td>Total inc. GST</td>
               <td colspan="3"></td>
               <td>{{ total.amount }}</td>
               <td>{{ total.prints.amount }}</td>
@@ -59,7 +59,6 @@
 </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';
@@ -92,7 +91,6 @@ 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 {{ taxName }}: <b>{{ refund.total | price(currency) }}</b>
+            Total ex GST: <b>{{ refund.total | price(currency) }}</b>
           </div>
           <div class="lc_regular16">
-            {{ taxName }}: <b>{{ refund.totalGST - refund.total | price(currency) }}</b>
+            GST: <b>{{ refund.totalGST - refund.total | price(currency) }}</b>
           </div>
           <div class="lc_regular16">
-            Total inc {{ taxName }}: <b>{{ refund.totalGST | price(currency) }}</b>
+            Total inc GST: <b>{{ refund.totalGST | price(currency) }}</b>
           </div>
         </div>
       </div>
@@ -103,7 +103,6 @@
 </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';
 
@@ -124,7 +123,6 @@ 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>{{ taxName }}</th>
-              <th>Total Inc. {{ taxName }}</th>
+              <th>GST</th>
+              <th>Total Inc. GST</th>
             </tr>
           </thead>
           <tbody class="centered">
@@ -46,7 +46,6 @@
 </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';
@@ -68,7 +67,6 @@ 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. {{ taxName }}</td>
+              <td> Total inc. GST</td>
               <td colspan="3"></td>
               <td>{{ total.amount }}</td>
               <td></td>
@@ -68,7 +68,6 @@
 </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';
@@ -97,7 +96,6 @@ 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 {{ taxName }}: <b>{{ (model.total + couponTotal) | price(order.currency) }}</b>
+              Total ex GST: <b>{{ (model.total + couponTotal) | price(order.currency) }}</b>
             </div>
             <div class="lc_regular16">
-              {{ taxName }}: <b>{{ model.totalGST - model.total | price(order.currency) }}</b>
+              GST: <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 {{ taxName }}: <b>{{ model.totalGST | price(order.currency) }}</b>
+              Total inc GST: <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 {{ taxName }}: <b>{{ (model.total + couponTotal) | price(order.currency) }}</b>
+            Total ex GST: <b>{{ (model.total + couponTotal) | price(order.currency) }}</b>
           </div>
           <div class="lc_regular16">
-            {{ taxName }}: <b>{{ model.totalGST - model.total | price(order.currency) }}</b>
+            GST: <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 {{ taxName }}: <b>{{ model.totalGST | price(order.currency) }}</b>
+            Total inc GST: <b>{{ model.totalGST | price(order.currency) }}</b>
           </div>
           <div class="lc_regular16">
             {{ isPaid ? 'Paid' : 'Pending Payment' }}: <b>{{ model.totalGST | price(order.currency) }}</b>
@@ -198,7 +198,6 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
 import OrderViewMixin from './order-view.mixin';
 import OrderViewProduct from './order_view_product/order-view-product';
 
@@ -213,9 +212,6 @@ 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 {{ taxName }}:
+                  Inclusive of GST:
                 </span>
                 <span class="PricingMainSection__section-content-value">
                   {{ productPricing.tax.totalPrice | price(currency) }}
@@ -225,7 +225,6 @@
 </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';
@@ -255,7 +254,6 @@ 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 {{ taxName }}: {{ productPricing.tax.totalPrice | price(currency) }}
+                        Inclusive of GST: {{ productPricing.tax.totalPrice | price(currency) }}
                       </div>
                       <div class="mt-10">
                         + Delivery
@@ -139,7 +139,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country', 'taxName']),
+    ...mapGetters(['shop']),
     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 }, 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 {{ taxName }})
+              (inclusive of GST)
             </div>
           </div>
         </div>
@@ -86,13 +86,8 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
-
 export default {
-  name: 'PricingHowWeCalculate',
-  computed: {
-    ...mapGetters(['taxName'])
-  }
+  name: 'PricingHowWeCalculate'
 };
 </script>
 

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']),
     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 }, 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 {{ taxName }}:
+                  Inclusive of GST:
                 </span>
                 <span class="PricingScreenPrintSection__section-content-value">
                   {{ productPricing.tax.totalPrice | price(currency) }}
@@ -226,7 +226,6 @@
 
 <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';
@@ -286,7 +285,6 @@ 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. {{ taxName }}</span>
+          class="lc_regular11 lc_bold">inc. GST</span>
       </div>
       <div
         v-if="withoutGst"
         :class="withGst ? 'lc_regular11' : 'lc_h4'">
-        {{ prePriceText }} {{ product[minPriceAttr] | price(currency) }} + {{ taxName }}
+        {{ prePriceText }} {{ product[minPriceAttr] | price(currency) }} + GST
       </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. {{ taxName }}</span>
+          class="lc_regular11 lc_bold"> inc. GST</span>
       </div>
       <div
         v-if="withoutGst"
         :class="withGst ? 'lc_regular11' : 'lc_h4'">
-        {{ prePriceText }} {{ product[minPriceAttr] | price(currency) }} {{ rangeDivider }} {{ product[maxPriceAttr] | price(currency) }} + {{ taxName }}
+        {{ prePriceText }} {{ product[minPriceAttr] | price(currency) }} {{ rangeDivider }} {{ product[maxPriceAttr] | price(currency) }} + GST
       </div>
     </div>
   </div>
@@ -84,8 +84,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'gstTax',
-      'taxName'
+      'gstTax'
     ])
   }
 };

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. {{ taxName }}</div>
+        <div class="ml-5">Inc. GST</div>
       </checkbox>
     </div>
     <tabs
@@ -88,7 +88,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop', 'taxName']),
+    ...mapGetters(['shop']),
     ...mapGetters('product', ['priceIncludeGST']),
     ...mapGetters(['helpMessages']),
     hasPrintSurcharge() {

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

@@ -10,21 +10,20 @@
     right: 0;
     top: 41px;
     padding: 10px;
-    background-color: white;
-    border: 1px solid $medium_gray;
-    z-index: 999;
+    background-color: $black;
+    color: $white;
   }
   &__result-item {
     padding-bottom: 10px;
     margin-bottom: 10px;
-    border-bottom: 1px solid $medium_gray;
+    border-bottom: 1px solid $gray_main;
     &:last-child {
       border-bottom: none;
       margin-bottom: 0px;
     }
     ::v-deep {
       a {
-        color: $gray_main;
+        color: $white;
         font-size: 13px;
         text-decoration: none;
       }
@@ -34,22 +33,24 @@
       padding: 10px;
       text-align: center;
       display: block;
-      background-color: $black;
-      color: $white !important;
+      background-color: $white;
       &:hover {
-        background-color: $white;
-        color: $black !important;
+        background-color: $black;
+        color: $white;
       }
     }
   }
   &__input {
     input {
-      border-color: $medium_gray;
+      background-color: #535353;
+      border: none;
       border-radius: 0px;
+      color: $white;
       height: 41px;
       position: relative;
       z-index: 1;
       &::placeholder {
+        font-weight: 600;
         font-size: 14px;
         color: $grey_3;
       }
@@ -60,6 +61,7 @@
       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: null
+          country: 'Australia'
         },
         expectedItemsQuantity: null,
         description: '',
@@ -366,7 +366,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop']),
+    ...mapGetters(['shop', 'currency']),
     ...mapGetters('cart', ['entities']),
   },
   methods: {
@@ -400,8 +400,7 @@ export default {
       try {
         this.processing = true;
         const recaptchaToken = await this.getRecaptcha('quote_request');
-        const body = {
-          recaptchaToken,
+        const quoteInfo = {
           ...this.quote,
           quoteTypes: Object.keys(this.selectedQuoteTypes),
           shop: this.shop._id,
@@ -428,9 +427,17 @@ export default {
               })
           } 
         };
+        const body = {
+          recaptchaToken,
+          ...quoteInfo
+        };
         const quote = await api.saveQuoteRequest(body, this.shop._id);
 
-        gtm.push({ event: 'generate_lead', currency: 'AUD' });
+        gtm.push({
+          event: 'submit_quote_request',
+          currency: this.currency?.symbol || 'AUD',
+          ...quoteInfo
+        });
 
         this.$toastr.s('Your request will be processed within 24-48 hours. Thank You.');
         this.$emit('added', quote);

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 {{ 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>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>
   </div>
 </template>
@@ -40,8 +40,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'gstTax',
-      'taxName'
+      'gstTax'
     ])
   },
   methods: {

package/components/subscribe/subscribe.vue

@@ -45,7 +45,8 @@
                 }" />
               <label
                 :for="'email' + uniqueKey"
-                class="form-label label-inner">
+                class="form-label label-inner"
+                @click="$refs.email.focus()">
                 Your email address
               </label>
               <span
@@ -77,6 +78,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import api from '@lancom/shared/assets/js/api';
+import gtm from '@lancom/shared/assets/js/utils/gtm';
 
 export default {
   name: 'Subscribe',
@@ -120,6 +122,13 @@ export default {
           ...this.subscriber
         };
         await api.subscribe(body, this.shop._id);
+
+        gtm.push({
+          event: 'submit_subscribe_form',
+          referer: window.location.href,
+          ...this.subscriber
+        });
+
         this.isSubscribed = true;
         this.subscriber.email = null;
       } catch (error) {