@lancom/shared 0.0.322 → 0.0.323

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

@@ -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

@@ -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/product/gallery/gallery.vue

@@ -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

@@ -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

@@ -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

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

package/store/quote.js

@@ -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,