@lancom/shared 0.0.145 → 0.0.148

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart-entity-color-simple-products.vue

@@ -46,7 +46,8 @@
             :key="simpleProduct._id"
             :simple-product="simpleProduct"
             :entity="entity"
-            :display-unit-price="displayUnitPrice" />
+            :display-unit-price="displayUnitPrice"
+            @change="onChangeQty" />
         </div>
         <div class="CartEntityColorSimpleProducts__totals">
           <div class="CartEntityColorSimpleProducts__total">

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart_entity_color_simple_product/cart-entity-color-simple-product.vue

@@ -119,6 +119,7 @@ export default {
       if (this.$refs.input) {
         this.$refs.input.blur();
       }
+      this.$emit('change');
     },
     onFocus() {
       this.defaultValue = '';
@@ -135,6 +136,7 @@ export default {
         amount: this.formatAmount(this.model + 1),
         shop: this.shop
       });
+      this.$emit('change');
     },
     decrease() {
       this.setSimpleProductAmount({
@@ -142,6 +144,7 @@ export default {
         amount: this.formatAmount(this.model - 1),
         shop: this.shop
       });
+      this.$emit('change');
     }
   }
 };

package/components/order/order_view/order-view.mixin.js

@@ -22,6 +22,9 @@ export default {
     },
   },
   computed: {
+    couponTotal() {
+      return Math.abs(this.order.couponTotal || 0);
+    },
     model() {
       return this.invoice || this.order;
     },

package/components/order/order_view/order-view.vue

@@ -136,11 +136,16 @@
             Shipping Total: <b>{{ model.shippingTotal | price }}</b>
           </div>
           <div class="lc_regular16">
-            Total ex GST: <b>{{ model.total | price }}</b>
+            Total ex GST: <b>{{ (model.total + couponTotal) | price }}</b>
           </div>
           <div class="lc_regular16">
             GST: <b>{{ model.totalGST - model.total | price }}</b>
           </div>
+          <div
+            v-if="!invoice && order.couponCode"
+            class="lc_regular16">
+            Coupon: <b>{{ couponTotal | price }}</b>
+          </div>
           <div class="lc_regular16">
             Total inc GST: <b>{{ model.totalGST | price }}</b>
           </div>

package/nuxt.config.js

@@ -45,7 +45,7 @@ module.exports = (config, axios, { raygunClient } = {}) => ({
     '@/node_modules/@lancom/shared/plugins/vee-validate',
     { src: '@/node_modules/@lancom/shared/plugins/vue-toastr', ssr: false },
     { src: '@/node_modules/@lancom/shared/plugins/vue-hummer', ssr: false },
-    '@/node_modules/@lancom/shared/plugins/vue-multiselect',
+    // '@/node_modules/@lancom/shared/plugins/vue-multiselect',
     '@/node_modules/@lancom/shared/plugins/vue-tooltip',
     { src: '@/node_modules/@lancom/shared/plugins/lazy', ssr: false },
     '@/node_modules/@lancom/shared/plugins/vue-click-outside',

package/package.json

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

package/plugins/vue-recaptcha.js

@@ -1,5 +1,7 @@
 import Vue from 'vue';
 
+let interval = null;
+
 export default () => {
   Vue.mixin({
     methods: {
@@ -9,7 +11,17 @@ export default () => {
       },
       async preloadReCaptcha() {
         if (!this.$recaptcha) {
+          clearInterval(interval);
           await this.loadReCaptcha();
+          await new Promise((resolve, reject) => {
+            interval = setInterval(() => {
+              console.log('check recaptcha...');
+              if (this.$recaptcha) {
+                clearInterval(interval);
+                resolve()
+              }
+            }, 100);
+          });
         }
       },
       async loadReCaptcha() {

package/store/cart.js

@@ -49,7 +49,7 @@ export const getters = {
   suburb: ({ suburb }) => suburb,
   cartPricing: ({ cartPricing }) => cartPricing,
   cartProductsPricing: ({ cartPricing }) => (cartPricing && cartPricing.products) || {},
-  isEmpty: (state, { simpleProductsQuantity }) => simpleProductsQuantity === 0,
+  isEmpty: (state, { entities }) => (entities || []).length === 0,
   quantities: ({ entities }) => ({
     products: getProductsQuantities(entities),
     prints: getPrintsQuantities(entities)