npm - @lancom/shared - Versions diffs - 0.0.322 → 0.0.324 - Mend

@lancom/shared 0.0.322 → 0.0.324

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/components/common/product_side_with_print/product-side-with-print.vue CHANGED Viewed

@@ -31,6 +31,9 @@ export default {
       type: String,
       required: true
     },
+    color: {
+      type: Object
+    },
     size: {
       default: 'small',
       validator(value) {
@@ -81,7 +84,7 @@ export default {
       return this.print && this.getImageBackground(this.print);
     },
     image() {
-      const color = this.defaultPreview ? null : (this.product.color || (this.product.colors || [])[0]);
+      const color = this.defaultPreview ? null : (this.color || this.product.color || (this.product.colors || [])[0]);
       const product = this.product?.product || this.product;
       return getColorImage(product, this.size, this.side, color) || getProductCover(product, this.size, this.side, color);
     },
@@ -102,11 +105,14 @@ export default {
       this.$modal.show(
         ImageViewer,
         {
-          items: this.products.map(product => ({
-            src: getColorImage(product, 'large', this.side),
-            print: this.print,
-            color: product.color.rgb
-          })),
+          items: this.products.map(product => {
+            const p = product.product || product;
+            return {
+              src: getColorImage(p, 'large', this.side, this.color) || getProductCover(p, this.size, this.side, this.color),
+              print: this.print,
+              color: this.color?.rgb || product.color?.rgb
+            };
+          }),
           index: this.products.indexOf(this.product)
         },
         {

package/components/order/order_product_prints_preview/order-product-prints-preview.vue CHANGED Viewed

@@ -7,6 +7,7 @@
         <product-side-with-print
           :product="product"
           :side="side"
+          :color="color"
           :default-preview="defaultPreview"
           size="medium" />
       </div>
@@ -31,6 +32,9 @@ export default {
       type: Object,
       required: true
     },
+    defaultColor: {
+      type: Object
+    },
     defaultPreview: {
       type: Boolean,
       default: true
@@ -39,6 +43,10 @@ export default {
   computed: {
     sides() {
       return Object.keys(this.product.printsThumbnails || {});
+    },
+    color() {
+      const simpleProduct = this.product.simpleProducts?.find(sp => sp.amount > 0);
+      return this.defaultColor || simpleProduct?.color;
     }
   }
 };

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

@@ -1,6 +1,7 @@
 import { mapGetters } from 'vuex';
 import { price, shortDate, tax } from '@lancom/shared/assets/js/utils/filters';
 import { getShopCountrySettings } from '@lancom/shared/assets/js/utils/shop';
+import { isSameAddresses } from '@lancom/shared/assets/js/utils/address';
 export default {
   filters: {
@@ -34,6 +35,9 @@ export default {
     isPaid() {
       return this.model.paymentStatus === 'paid';
     },
+    isDisplayShippingAddress() {
+      return !isSameAddresses(this.order.shippingAddress, this.displayAddress);
+    },
     orderId() {
       return `${this.order.code}`.replace('ORDER', '');
     },
@@ -67,6 +71,16 @@ export default {
     purchaseOrderNumber() {
       return this.invoice?.purchaseOrderNumber || this.order.purchaseOrderNumber;
     },
+    shippingAddress() {
+      return [
+        this.order.shippingAddress?.addressLine1,
+        this.order.shippingAddress?.addressLine2,
+        this.order.shippingAddress?.city,
+        this.order.shippingAddress?.postcode,
+        this.order.shippingAddress?.state,
+        this.order.shippingAddress?.country
+      ].filter(i => !!i).join(', ');
+    },
     orderAddress() {
       return [
         this.displayAddress.addressLine1,

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

@@ -64,6 +64,11 @@
           <div class="lc_regular16">
             <b>Order</b>
           </div>
+          <div
+            v-if="isDisplayShippingAddress"
+            class="mt-10">
+            <b>Billing Address</b>
+          </div>
           <div class="lc_regular16">
             {{ fullName }}
           </div>
@@ -86,6 +91,35 @@
           <div class="lc_regular16">
             {{ additionalInfo }}
           </div>
+          <div
+            v-if="isDisplayShippingAddress && order.shippingAddress"
+            class="mt-10">
+            <div>
+              <b>Shipping Address</b>
+            </div>
+            <div class="lc_regular16">
+              {{ order.shippingAddress.fullName }}
+            </div>
+            <div
+              v-if="order.shippingAddress.company"
+              class="lc_regular16">
+              {{ order.shippingAddress.company }}
+            </div>
+            <div
+              v-if="order.shippingAddress.phone"
+              class="lc_regular16">
+              {{ order.shippingAddress.phone }}
+            </div>
+            <div class="lc_regular16">
+              {{ order.shippingAddress.email }}
+            </div>
+            <div class="lc_regular16">
+              {{ shippingAddress }}
+            </div>
+            <div class="lc_regular16">
+              {{ order.shippingAddress.additionalInfo }}
+            </div>
+          </div>
         </td>
         <td
           v-if="model.paid"

package/components/order/order_view/order_view_product/order-view-product.vue CHANGED Viewed

@@ -132,11 +132,12 @@ export default {
         if ((print.products || []).indexOf(this.product.guid) > 0) {
           isFreePricing = true;
         }
-        const printCost = print.costType === 'setup only' ? 0 : print.printCost;
-        const setupCost = (print.costType === 'item cost only' || isFreePricing) ? 0 : print.setupCost;
+        const printCost = (print.costType === 'setup only' ? 0 : print.printCost) || 0;
+        const setupCost = ((print.costType === 'item cost only' || isFreePricing) ? 0 : print.setupCost) || 0;
         return total + this.amount * printCost + setupCost;
       }, 0);
-      const productsTotal = this.simpleProducts.reduce((total, { amount = 0, productCost = 0 }) => total + amount * productCost, 0);
+      console.log('totalPrice: ', productsTotal, printsTotal);
+      const productsTotal = this.simpleProducts.reduce((total, { amount = 0, productCost = 0 }) => total + (amount || 0) * (productCost || 0), 0);
       return this.amount > 0 ? (printsTotal + productsTotal) : 0;
     }
   }

package/components/product/gallery/gallery.vue CHANGED Viewed

@@ -18,7 +18,7 @@
           <div
             v-if="currentImage.print.pricing"
             class="Gallery__big-print-price">
-            Printing at <price :price="currentImage.print.pricing.price" /> for ({{ image.print.pricing.min || 1 }}+)
+            Printing at <price :price="currentImage.print.pricing.price" /> for ({{ currentImage.print.pricing.min || 1 }}+)
           </div>
           <div class="Gallery__big-print-price-info">
             example only

package/components/quotes/quote_view/quote-view.vue CHANGED Viewed

@@ -30,12 +30,14 @@
       <tr>
         <td>
           <div><b>QUOTE</b></div>
-          <div>{{ quote.address.fullName }}</div>
-          <div v-if="quote.address.company">{{ quote.address.company }}</div>
-          <div v-if="quote.address.phone">{{ quote.address.phone }}</div>
-          <div>{{ quote.address.email }}</div>
-          <div>{{ quoteAddress }}</div>
-          <div>{{ quote.address.additionalInfo }}</div>
+          <div v-if="quote.address">
+            <div>{{ quote.address.fullName }}</div>
+            <div v-if="quote.address.company">{{ quote.address.company }}</div>
+            <div v-if="quote.address.phone">{{ quote.address.phone }}</div>
+            <div>{{ quote.address.email }}</div>
+            <div>{{ quoteAddress }}</div>
+            <div>{{ quote.address.additionalInfo }}</div>
+          </div>
         </td>
         <td class="w-50">
           <div><b>{{ MESSAGES.DIRECT_DEPOSIT_DETAILS || 'DIRECT DEPOSIT DETAILS'}}</b></div>

package/feeds/google-shopping.js CHANGED Viewed

@@ -41,7 +41,7 @@ async function googleShoppingFeed(axios, config, availableStores, country, endSl
               const backImages = (product.images || []).filter(i => (i.types || []).includes('back') && sp.color._id === i.color).map(i => i.image);
               const catalogFrontImages = (product.images || []).filter(i => (i.types || []).includes('catalog_front')).map(i => i.image);
               const image = spliceFirstImage(feedImages) || spliceFirstImage(frontImages) || spliceFirstImage(catalogFrontImages) || spliceFirstImage(backImages) || null;
-              const images = getImages(backImages) || getImages(frontImages) || [];
+              const images = (!backImages?.includes(image) && getImages(backImages)) || (!frontImages?.includes(image) && getImages(frontImages)) || [];
               const feedTitle = (product.feedTitle || '')
                 .replace(/{colour}/g, sp.color.name)
                 .replace(/{size}/g, sp.size.name)

package/package.json CHANGED Viewed

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

package/store/quote.js CHANGED Viewed

@@ -10,6 +10,7 @@ export const state = () => ({
 export const getters = {
   quote: ({ quote }) => quote,
+  address: ({ quote }) => quote.address || quote.billingAddress,
   viewedOptions: ({ viewedOptions }) => viewedOptions,
   viewedOptionsMap: ({ viewedOptions }) => viewedOptions?.reduce((data, option) => ({ ...data, [option]: true }), {}),
   option: ({ option }) => option,