@lancom/shared 0.0.320 → 0.0.322

package/assets/js/utils/quote.js

@@ -8,7 +8,7 @@ export function convertQuoteToOrder(quote, option) {
     deliveryAfter: quote.deliveryAfter,
     referenceField: quote.reference,
     paymentMethod: option.paymentMethod || 'deposit',
-    billingAddress: quote.address,
+    billingAddress: quote.billingAddress || quote.address,
     notes: (quote.notes || []).filter(({ text }) => !!text),
     shippingAddress: quote.address,
     products: option.products.map(p => ({

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

@@ -67,7 +67,7 @@
           <progress-steps-controls
             class="OrderPaymentInformation__controls"
             :disabled-prev="creating"
-            :disabled-next="creating"
+            :disabled-next="loadingCard || creating || submitting"
             label-next="MAKE PAYMENT"
             @prev="$emit('prev')"
             @next="submit" />
@@ -106,6 +106,7 @@ export default {
     return {
       initing: false,
       creating: false,
+      submitting: false,
       loadingCard: true,
       isDepositPayment: this.order.paymentMethod === ORDER_PAYMENT_METHOD.DEPOSIT
     };
@@ -163,7 +164,7 @@ export default {
       }).join('</p><p>')}</p>`;
     },
     async submit() {
-      this.creating = true;
+      this.submitting = true;
       this.errorMessage = null;
 
       const orderInfo = this.orderData || generateOrderData(this.order, this.entities, this.cartPricing);
@@ -186,6 +187,7 @@ export default {
         }
       }
       this.creating = false;
+      this.submitting = false;
       // this.$emit('next');
     },
     async submitOrder() {

package/components/common/payment/payment_card/stripe_payment/stripe-payment.vue

@@ -36,7 +36,7 @@ export default {
       return this.payment.clientKey;
     }
   },
-  created() {
+  mounted() {
     this.loadStripe();
   },
   destroyed() {
@@ -77,9 +77,8 @@ export default {
           };
           document.body.appendChild(domElement);
         } else {
-          let repeated = 0;
           timer = setInterval(() => {
-            if (typeof window.Stripe !== 'undefined' || repeated++ > 40) {
+            if (typeof window.Stripe !== 'undefined') {
               this.onLoaded();
               clearInterval(timer);
             }

package/components/product/wizard/wizard_print/wizard-print.vue

@@ -71,21 +71,22 @@ export default {
         types: ['black print', 'full colour print'],
         icon: 'printed',
         name: 'DIGITAL',
-        subName: 'Minimum 12',
+        subName: '',
         description: [
-          'Free Setup on all orders',
-          'Standard turn around time of 5 days',
-          'Same or next day rush service available'
+          'Free Setup on all Black prints',
+          'Standard turn around time of 5-10 days',
+          'Same or next day rush service available',
+          'Pickup from warehouse in Arndell Park'
         ]
         // info: 'DIGITAL - minimum 12'
       }, {
         types: ['embroidery'],
         name: 'Embroidery',
-        subName: 'Minimum 20',
+        subName: 'Minimum 10',
         description: [
-          'Free setup on orders over 50 items',
-          'Best for polo or high vis shirts',
-          'Standard turn around time of 8-10 days'
+          'Free setup on repeat orders',
+          'Standard turn around time of 8-10 days',
+          'Embroidery pricing subject to changes'
         ],
         info: 'Embroidery'
       }, {

package/package.json

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