@lancom/shared 0.0.144 → 0.0.147

package/assets/js/utils/colors.js

@@ -47,13 +47,13 @@ export const getProductMediumCover = (product, type, color) => getProductCover(p
 export const getProductLargeCover = (product, type, color) => getProductCover(product, 'large', type, color);
 export const getProductOriginCover = (product, type, color) => getProductCover(product, 'origin', type, color);
 
-export function getColorBackgroundStyle(color, allowPattern = true) {
+export function getColorBackgroundStyle(color) {
   const { rgb, pattern, name } = color || {};
 
   if (pattern) {
-    return allowPattern ? {
+    return {
       'background-image': `url("${pattern}")`
-    } : null;
+    };
   }
 
   return {

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/components/product/product_color_image/product-color-image.vue

@@ -2,8 +2,7 @@
   <div
     class="ProductColorImage"
     :class="{ zoomedIn }"
-    :style="style"
-    v-lazy:background-image="pattern">
+    :style="style">
   </div>
 </template>
 
@@ -23,11 +22,8 @@ export default {
     }
   },
   computed: {
-    pattern() {
-      return this.color.pattern;
-    },
     style() {
-      return getColorBackgroundStyle(this.color, false);
+      return getColorBackgroundStyle(this.color);
     }
   }
 };

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.144",
+  "version": "0.0.147",
   "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() {