@lancom/shared 0.0.257 → 0.0.258

package/assets/js/api/admin.js

@@ -132,34 +132,34 @@ export default {
     return _post(`admin/orders/pick-pdf`, { orders });
   },
   saveOrderSubsequentInvoice(order, invoice) {
-    return invoice._id ? _put(`admin/shop/${order.shop}/order/${order._id}/invoice/${invoice._id}`, invoice) : _post(`admin/shop/${order.shop}/order/${order._id}/invoice`, invoice);
+    return invoice._id ? _put(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/invoice/${invoice._id}`, invoice) : _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/invoice`, invoice);
   },
   sendOrderSubsequentInvoice(order, invoice) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/invoice/${invoice}/send`);
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/invoice/${invoice}/send`);
   },
-  exportOrderToStarshipit(order, shipment) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/export-to-starshipit`, shipment);
+  exportOrderToShippingService(order, shipment) {
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/export-to-shipping-service`, shipment);
   },
   markShipmentAsDispatched(order, shipment) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/dispatched`, shipment);
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/dispatched`, shipment);
   },
   markSubOrderAsDispatched(order, subOrder) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/sub-order/${subOrder._id}/dispatched`, subOrder);
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/sub-order/${subOrder._id}/dispatched`, subOrder);
   },
   generateDuplicateOrderCode(order) {
     return _get(`admin/order/${order}/duplicate-code`);
   },
   sendShipmentTracking(order, shipment, tracking) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/tracking/${tracking._id}/send`, tracking);
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/tracking/${tracking._id}/send`, tracking);
   },
-  removeShipmentFromStarshipit(order, shipment) {
-    return _delete(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}`);
+  removeShipment(order, shipment) {
+    return _delete(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}`);
   },
   calculateShipmentRates(order, shipment) {
-    return _get(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/calculate-shipping`);
+    return _get(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/calculate-shipping`);
   },
   createPrintLabels(order, shipment, rate) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/print-labels`, rate);
+    return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/print-labels`, rate);
   },
   createOrderRefund(order, refund, shop) {
     return _post(`shop/${shop}/order/${order}/refund`, refund);

package/assets/js/constants/country.js

@@ -1,4 +1,4 @@
 export const COUNTRIES_CODES = {
   Australia: 'AU',
-  'United Kingdom': 'UK'
+  'United Kingdom': 'GB'
 };

package/assets/scss/ui_kit/_forms.scss

@@ -177,7 +177,7 @@ html[dir=rtl] .form-icon-left {
   height: 50px;
   border-width: 1px;
   border-style: solid;
-  border-color: #EFF1F2;
+  border-color: $grey_3;
   border-radius: 5px;
   font-style: normal;
   font-weight: normal;
@@ -424,7 +424,7 @@ html[dir=rtl] .textarea {
   }
   &__tags {
     min-height: 50px;
-    border: 1px solid #e5e5e5;
+    border: 1px solid $grey_3;
     border-radius: 8px !important;
     padding: 19px 3px 4px 20px;
   }

package/assets/scss/ui_kit/_tooltip.scss

@@ -1,3 +1,5 @@
+@import "@/assets/scss/variables";
+
 .tooltip {
   display: block !important;
   z-index: 10000;
@@ -25,7 +27,7 @@
   &.white &-inner {
     background: #FFF !important;
     color: #575872 !important;
-    border: 1px solid #EFF1F2 !important;
+    border: 1px solid $grey_3 !important;
   }
   &.white &-arrow {
     border-color: #FFF !important;

package/assets/scss/variables/_theme.scss

@@ -15,7 +15,7 @@ $white_high_emphasis: #FFFFFF;
 $white_medium_emphasis: rgba(255, 255, 255, .66);
 $gray: #575872 !default;
 $medium_gray: #B0B0BA !default;
-$light_gray: #F9F9FC !default;
+$light_gray: #F9F9FC;
 $link: #5D89A9;
 $error: #E44868;
 $secondary_900: #20303C;
@@ -52,8 +52,8 @@ $black: #343750 !default;
 $gray_main: #616277 !default;
 $grey_1: #616277 !default;
 $grey_2: #B0B0BA !default;
-$grey_3: #EFF1F2 !default;
-$grey_4: #F9F9FC !default;
+$grey_3: #EFF1F2;
+$grey_4: #F9F9FC;
 $grey_5: #9898A5 !default;
 
 $white: #fff;

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

@@ -12,7 +12,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop']),
+    ...mapGetters(['shop', 'country']),
     ...mapGetters('auth', ['user']),
     ...mapGetters('cart', [
       'entities',
@@ -45,11 +45,11 @@ export default {
   },
   watch: {
     entities() {
-      this.calculateCartPriceWithDebounce({ shop: this.shop });
+      this.calculateCartPriceWithDebounce({ shop: this.shop, country: this.country });
     }
   },
   mounted() {
-    this.calculateCartPriceWithDebounce({ shop: this.shop });
+    this.calculateCartPriceWithDebounce({ shop: this.shop, country: this.country });
     if (!this.suburb && this.user?.suburb) {
       this.handleSuburbChange(this.user.suburb);
     }
@@ -65,11 +65,11 @@ export default {
     ]),
     handleSuburbChange(suburb) {
       this.setSuburb(suburb);
-      this.calculateCartPrice({ shop: this.shop });
+      this.calculateCartPrice({ shop: this.shop, country: this.country });
     },
     handleCouponChange(coupon) {
       this.setCoupon(coupon);
-      this.calculateCartPrice({ shop: this.shop });
+      this.calculateCartPrice({ shop: this.shop, country: this.country });
     },
     async removeSimpleProducts(simpleProducts) {
       const message = 'This will delete all items in this row, Press OK to continue or Cancel';

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

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

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 })">
+          @click="selectRate({ supplier, rate, shop, country })">
           <div class="CartShipmentsPricing__rate-info">
             <div class="CartShipmentsPricing__rate-icon">
               <checked-icon :checked="rate.selected" />
@@ -77,7 +77,7 @@ export default {
   },
   mixins: [confirm],
   computed: {
-    ...mapGetters(['shop']),
+    ...mapGetters(['shop', 'country']),
     ...mapGetters('cart', [
       'cartPricing'
     ]),

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

@@ -203,7 +203,7 @@
           <input
             id="country"
             ref="country"
-            value="Only Australia"
+            :value="address.country === 'Australia' ? 'Only Australia' : address.country"
             name="country"
             type="country"
             class="form-field filled labelless"
@@ -264,7 +264,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['shop']),
+    ...mapGetters(['shop', 'country']),
     ...mapGetters('cart', [
       'suburb'
     ]),
@@ -296,12 +296,13 @@ export default {
         this.$set(this.address, 'state', suburb.state);
         this.$set(this.address, 'postcode', suburb.postcode);
         this.$set(this.address, 'city', suburb.locality);
+        this.$set(this.address, 'country', suburb.country);
       }
     },
     handleSuburbChange(suburb) {
       this.setAddressSuburb(suburb);
       this.setSuburb(suburb);
-      this.calculateCartPrice({ shop: this.shop });
+      this.calculateCartPrice({ shop: this.shop, country: this.country });
     }
   }
 };

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

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

package/components/checkout/order/order.vue

@@ -98,7 +98,7 @@ export default {
       company: null,
       additionalInfo: null,
       suburb: null,
-      country: 'Australia',
+      country: null,
       state: null,
       postcode: null
     };

package/components/common/payment/payment_card/pinpayment/pinpayment.vue

@@ -86,6 +86,8 @@
 </template>
 
 <script>
+let interval = null;
+
 export default {
   name: 'Payment',
   props: {
@@ -108,14 +110,17 @@ export default {
       fields: null
     };
   },
-  mounted() {
+  async mounted() {
     this.loading = true;
+
+    await this.preloadPinpayments();
+
     if (window.HostedFields) {
-      this.initHostedPayment();
+      await this.initHostedPayment();
     } else {
-      window.addEventListener('load', () => {
+      window.addEventListener('load', async () => {
         if (!this.fields) {
-          this.initHostedPayment();
+          await this.initHostedPayment();
         }
       });
     }
@@ -194,7 +199,31 @@ export default {
           }
         );
       });
-    }
+    },
+    async preloadPinpayments() {
+        if (!window.HostedFields) {
+          clearInterval(interval);
+          await this.loadPinpayments();
+          await new Promise((resolve, reject) => {
+            interval = setInterval(() => {
+              if (window.HostedFields) {
+                clearInterval(interval);
+                resolve()
+              }
+            }, 100);
+          });
+        }
+      },
+      loadPinpayments() {
+        return new Promise((resolve) => {
+          const script = document.createElement('script');
+          script.type = "text/javascript";
+          script.src = 'https://cdn.pinpayments.com/pin.hosted_fields.v1.js';
+          script.onload = () => resolve();
+          const body = document.getElementsByTagName('body')[0]; 
+          body.appendChild(script);
+        });
+      }
   }
 };
 </script>

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

@@ -88,6 +88,9 @@ export default {
   },
   filters: { highlight },
   props: {
+    country: {
+      type: Object
+    },
     value: {
       type: String
     },
@@ -147,7 +150,8 @@ export default {
     async handleSearch(query) {
       if (query.length) {
         this.isLoading = true;
-        this.suburbs = await api.fetchSuburbs({ query });
+        const country = this.country ? (this.country.isoCode === 'GB' ? 'England' : (this.country.name || this.country)) : 'Australia';
+        this.suburbs = await api.fetchSuburbs({ query, country });
         this.options = this.suburbs.map(this.createOptionFromSuburb);
         this.isLoading = false;
       } else {

package/components/common/products_total_pricing/products-total-pricing.vue

@@ -21,13 +21,14 @@
         Total: {{ pricing.totalPrice | price(currency) }} <br />
       </div>
       <div class="lc_regular14 mt-4">
-        Incl. GST ({{ pricing.tax.percent }}) {{ pricing.tax.totalPrice | price(currency) }}
+        Incl. {{ taxName }} ({{ pricing.tax.percent }}) {{ pricing.tax.totalPrice | price(currency) }}
       </div>
     </div>
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import { price } from '@lancom/shared/assets/js/utils/filters';
 
 export default {
@@ -44,6 +45,9 @@ export default {
       type: String,
       default: 'Tee'
     }
+  },
+  computed: {
+    ...mapGetters(['taxName'])
   }
 };
 </script>

package/components/design/approve_design_header/approve-design-header.vue

@@ -36,7 +36,7 @@
           {{ order.postcode }},
           {{ order.state }},
           {{ order.city }},
-          Australia
+          {{ order.country || 'Australia'}}
         </span>
       </div>
     </div>

package/components/editor/editor.vue

@@ -18,7 +18,9 @@
               </component>
             </template>
           </tabs>
-          <div class="Editor__footer">
+          <div
+            v-if="productAvailableInCurrentCountry"
+            class="Editor__footer">
             <btn
               btn-label="Start again"
               btn-class="white"
@@ -135,8 +137,12 @@ export default {
     ...mapGetters('layers', [
       'layerThumbnails'
     ]),
+    productAvailableInCurrentCountry() {
+      const { countries } = this.product;
+      return !(countries || []).length || countries.includes(this.country._id);
+    },
     addToCartDisabled() {
-      return !(this.template.layers.length && this.usedSimpleProducts.length);
+      return !this.usedSimpleProducts.length || (this.product.printOnly && !this.template.layers.length);
     }
   },
   watch: {

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

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

package/components/editor/editor_pricing/editor_pricing_details/editor_pricing_details_prints/editor-pricing-details-prints.vue

@@ -32,18 +32,18 @@
           </td>
           <td>
             <strong>
-              {{ group.setupPriceWithoutTax | priceWithTax(pricingSettings, currency) }}
+              {{ (priceIncludeGST ? group.setupPrice : group.setupPriceWithoutTax) | priceWithTax(pricingSettings, currency) }}
             </strong>
           </td>
           <td>
             <span v-if="group.costType !== 'setup only'">
               <strong>
-                {{ (displayPricingWithTax ? group.totalPrice : group.totalPriceWithoutTax) | price(currency) }}
+                {{ (priceIncludeGST ? group.totalPrice : group.totalPriceWithoutTax) | price(currency) }}
               </strong>
-              = {{ group.amount }} x {{ (displayPricingWithTax ? group.price : group.priceWithoutTax) | price(currency) }}
+              = {{ group.amount }} x {{ (priceIncludeGST ? group.price : group.priceWithoutTax) | price(currency) }}
             </span>
             <strong v-else>
-              {{ (displayPricingWithTax ? group.totalPrice : group.totalPriceWithoutTax) | price(currency) }}
+              {{ (priceIncludeGST ? group.totalPrice : group.totalPriceWithoutTax) | price(currency) }}
             </strong>
           </td>
         </tr>
@@ -58,7 +58,7 @@
           </td>
           <td>
             <strong>
-              {{ (displayPricingWithTax ? productPricing.products.prints.totalPrice : productPricing.products.prints.totalPriceWithoutTax) | price(currency) }}
+              {{ (priceIncludeGST ? productPricing.products.prints.totalPrice : productPricing.products.prints.totalPriceWithoutTax) | price(currency) }}
             </strong>
           </td>
         </tr>
@@ -80,12 +80,13 @@ export default {
     sizesRange
   },
   computed: {
-    ...mapGetters(['displayPricingWithTax', 'pricingSettings']),
+    ...mapGetters(['pricingSettings']),
     ...mapGetters('product', [
       'product',
       'usedSimpleProducts',
       'productPricing',
-      'mainProductPricing'
+      'mainProductPricing',
+      'priceIncludeGST'
     ]),
     hasPrintSurcharge() {
       return this.product.printSurcharge > 0;

package/components/editor/editor_pricing/editor_pricing_details/editor_pricing_details_products/editor-pricing-details-products.vue

@@ -31,13 +31,20 @@
             {{ group.sizes | sizesRange }}
           </td>
           <td>
-            <span class="EditorPricingDetailsProducts__hoverable">
+            <span
+              v-if="priceIncludeGST"
+              class="EditorPricingDetailsProducts__hoverable">
               {{ groupPrice | priceWithTax(pricingSettings, currency) }}
             </span>
+            <span
+              v-else
+              class="EditorPricingDetailsProducts__hoverable">
+              {{ groupPrice | price(currency) }}
+            </span>
           </td>
           <td>
             <strong>
-              {{ (displayPricingWithTax ? group.totalPrice : group.totalPriceWithoutTax) | price(currency) }}
+              {{ (priceIncludeGST ? group.totalPrice : group.totalPriceWithoutTax) | price(currency) }}
             </strong>
           </td>
         </tr>
@@ -47,7 +54,7 @@
           </td>
           <td>
             <strong>
-              {{ (displayPricingWithTax ? productPricing.products.products.totalPrice : productPricing.products.products.totalPriceWithoutTax) | price(currency) }}
+              {{ (priceIncludeGST ? productPricing.products.products.totalPrice : productPricing.products.products.totalPriceWithoutTax) | price(currency) }}
             </strong>
           </td>
         </tr>
@@ -69,12 +76,13 @@ export default {
     sizesRange
   },
   computed: {
-    ...mapGetters(['displayPricingWithTax', 'pricingSettings']),
+    ...mapGetters(['pricingSettings']),
     ...mapGetters('product', [
       'product',
       'usedSimpleProducts',
       'mainProductPricing',
-      'productPricing'
+      'productPricing',
+      'priceIncludeGST'
     ]),
     hasUsedSimpleProducts() {
       return this.usedSimpleProducts.length > 0;

package/components/editor/editor_product_details/editor-product-details.scss

@@ -47,4 +47,10 @@
       text-align: center;
     }
   }
+  &__available-warning {
+    background-color: $error;
+    color: $white;
+    padding: 10px;
+    margin-top: 10px;
+  }
 }

package/components/editor/editor_product_details/editor-product-details.vue

@@ -61,8 +61,13 @@
         </div>
       </div>
     </div>
+    <div
+      v-if="!productAvailableInCurrentCountry"
+      class="EditorProductDetails__available-warning">
+      Product Not Available in {{ country.name }}
+    </div>
     <fragment
-      v-if="productDetailsLoaded">
+      v-if="productDetailsLoaded && productAvailableInCurrentCountry">
       <div class="EditorProductDetails__section">
         <product-colors-selector />
       </div>
@@ -112,8 +117,13 @@ export default {
       'layerThumbnails'
     ]),
     ...mapGetters([
-      'pricingSettings'
+      'pricingSettings',
+      'country'
     ]),
+    productAvailableInCurrentCountry() {
+      const { countries } = this.product;
+      return !(countries || []).length || countries.includes(this.country._id);
+    },
     productLink() {
       return generateProductLink(this.product);
     },

package/components/faq/faq.vue

@@ -111,7 +111,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import "@lancom/shared/assets/scss/variables";
+@import "@/assets/scss/variables";
 $types: delivery, general, other, printing, garments;
 .FAQ {
   &__wrapper {
@@ -218,7 +218,7 @@ $types: delivery, general, other, printing, garments;
     &-body {
       padding: 6px 30px 24px 30px;
       line-height: 27px;
-      color: $gray;
+      color: $grey_1;
       overflow: hidden;
       @import "@lancom/shared/assets/scss/normalize";
     }

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

@@ -127,11 +127,11 @@
             {{ errors[0] }}
           </span>
         </validation-provider>
-        <div class="form-row">
+        <div v-if="suburb" class="form-row">
           <input
             id="country"
             ref="country"
-            value="Only Australia"
+            :value="suburb.country"
             name="country"
             type="country"
             class="form-field filled labelless"
@@ -303,6 +303,9 @@ 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,
@@ -325,16 +328,27 @@ 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 });
+      this.calculateCartPrice({ shop: this.shop, country: this.country });
     },
     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,19 +25,20 @@
         <b>Delivery:</b> {{ price.shipping.totalPriceWithoutTax | price(currency) }} ({{ price.shipping.weight }})
       </div>
       <div class="lc_caption OrderPrice__row">
-        <b>Order amount ex GST:</b> {{ price.totalPriceWithoutTax | price(currency) }}
+        <b>Order amount ex {{ taxName }}:</b> {{ price.totalPriceWithoutTax | price(currency) }}
       </div>
       <div class="lc_caption OrderPrice__row">
-        <b>GST:</b> {{ price.tax.totalPrice | price(currency) }} ({{ price.tax.percent }})
+        <b>{{ taxName }}:</b> {{ price.tax.totalPrice | price(currency) }} ({{ price.tax.percent }})
       </div>
       <div class="lc_caption OrderPrice__row">
-        <b>Order amount inc GST:</b> {{ price.totalPrice | price(currency) }}
+        <b>Order amount inc {{ taxName }}:</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';
 
@@ -51,6 +52,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['taxName']),
     price() {
       return this.order.price;
     },