@lancom/shared 0.0.239 → 0.0.240

package/assets/js/api/admin.js

@@ -263,8 +263,8 @@ export default {
   fetchInventoryHistory(params) {
     return _get('admin/inventory-history', params);
   },
-  fetchInventoryCommitted(params) {
-    return _get('admin/inventory/committed', params);
+  removeInventoryHistory(id) {
+    return _delete(`admin/inventory-history/${id}`);
   },
   fetchInventory(params) {
     return _get('admin/inventory');

package/assets/js/constants/country.js

@@ -0,0 +1,4 @@
+export const COUNTRIES_CODES = {
+  Australia: 'AU',
+  'United Kingdom': 'UK'
+};

package/assets/js/utils/gapis.js

@@ -1,3 +1,6 @@
+import dayjs from 'dayjs';
+import { COUNTRIES_CODES } from '@lancom/shared/assets/js/constants/country';
+
 function surveyOptin(order, shop) {
   if (!window.renderOptIn) {
     const tag = document.createElement('script');
@@ -42,12 +45,12 @@ function surveyoptinRender(order, shop) {
         .filter(gtin => !!gtin)
     ];
   }, []);
-  const estimated_delivery_date = "2023-11-28";
+  const estimated_delivery_date = dayjs(new Date()).add(15, 'day').format('YYYY-MM-DD');
   const data = {
     merchant_id: MERCHANT_ID,
     order_id: order.code,
     email: order.shippingAddress.email,
-    delivery_country: order.shippingAddress.country,
+    delivery_country: COUNTRIES_CODES[order.shippingAddress.country] || order.shippingAddress.country,
     estimated_delivery_date,
     products,
     opt_in_style: "BOTTOM_RIGHT_DIALOG"

package/assets/js/utils/gtm.js

@@ -1,3 +1,5 @@
+import { COUNTRIES_CODES } from '@lancom/shared/assets/js/constants/country';
+
 const gtm = {
   push(data, skipReset) {
     console.log('push:data: ', data);
@@ -9,6 +11,15 @@ const gtm = {
     }
     window.dataLayer.push(data);
   },
+  viewItem(product) {
+    this.push({
+      value: product.minPrice,
+      items: [{
+        id: product.SKU, 
+        google_business_vertical: 'retail'
+      }]
+    });
+  },
   addToCart(entities, pricing) {
     this.push({
       event: 'add_to_cart',
@@ -30,7 +41,7 @@ const gtm = {
   viewCart(entities, pricing) {
     if (pricing) {
       this.push({
-        event: 'view_cart',
+        event: 'view_item_list',
         value: pricing.totalPriceWithoutTax,
         currency: 'AUD',
         coupon: pricing.coupon?.code,
@@ -88,7 +99,7 @@ const gtm = {
         city,
         region: state,
         postal_code: +postcode,
-        country
+        country: COUNTRIES_CODES[country] || country
       };
     }
     gtm.push(event);
@@ -135,13 +146,15 @@ function getOrderItems(order) {
 function getOrderItem(product, simpleProduct) {
   const { SKU, productCost, amount, color, size } = simpleProduct;
   return {
-    item_id: product.SKU,
+    id: product.SKU,
+    item_id: SKU,
     item_variant: `${product.name} ${color?.name || ''}-${size?.shortName || ''}`.trim(),
     item_name: product.name.trim(),
     item_brand: product.brand.name,
     price: productCost,
     currency: 'AUD',
-    quantity: amount
+    quantity: amount,
+    google_business_vertical: 'retail'
   };
 }
 

package/components/product/product_size_selector/product_size_selector_color/product_size_selector_color_cell/product-size-selector-color-cell.vue

@@ -84,7 +84,7 @@ export default {
   data() {
     return {
       uniqueFieldId: `size-selector-${this.color._id}-${this.size._id}`,
-      defaultValue: 0
+      defaultValue: null
     };
   },
   computed: {
@@ -122,7 +122,7 @@ export default {
       this.defaultValue = '';
     },
     onBlur() {
-      this.defaultValue = 0;
+      this.defaultValue = null;
     }
   }
 };

package/components/quotes/quote_request/quote-request.vue

@@ -366,7 +366,8 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop'])
+    ...mapGetters(['shop']),
+    ...mapGetters('cart', ['entities']),
   },
   methods: {
     handleUploaded(file) {
@@ -403,7 +404,29 @@ export default {
           recaptchaToken,
           ...this.quote,
           quoteTypes: Object.keys(this.selectedQuoteTypes),
-          shop: this.shop._id
+          shop: this.shop._id,
+          referer: window.location.href,
+          cartInfo: {
+            entities: (this.entities || [])
+              .map(({ product, simpleProducts, prints }) => {
+                return {
+                  product: product ? { _id: product.name, name: product.name, SKU: product.SKU } : null,
+                  prints: (prints || [])
+                    .map(({ layers, printArea, printSize, printType }) => ({
+                      layers,
+                      printArea: printArea ? { _id: printArea._id, name: printArea.name } : null,
+                      printSize: printSize ? { _id: printSize._id, name: printSize.name} : null,
+                      printType: printType ? { _id: printType._id, name: printType.name} : null,
+                    })),
+                  simpleProducts: (simpleProducts || [])
+                    .filter(({ amount }) => amount > 0)
+                    .map(({ amount, SKU }) => ({
+                      amount,
+                      SKU,
+                    }))
+                };
+              })
+          } 
         };
         const quote = await api.saveQuoteRequest(body, this.shop._id);
 

package/feeds/google-shopping.js

@@ -0,0 +1,108 @@
+async function googleShoppingFeed(axios, config, availableStores) {
+  const { data } = await axios.get(`${config.LOCAL_API_URL}/feed/products?host=${config.HOST_NAME}`);
+  const spliceFirstImage = images => (images || []).splice(0, 1)[0];
+  const getImages = images => (images || []).length > 0 ? images : null;
+  const channel = {
+    title: { _text: 'All products' },
+    link: { _text: `https://${config.HOST_NAME}` },
+    generator: { _text: config.HOST_NAME },
+    item: data
+      .reduce((items, product) => {
+        return [
+          ...items,
+          ...(product.simpleProducts || [])
+            .filter(sp => {
+              return !availableStores || availableStores.includes(sp.storeCode);
+            })
+            .map(sp => {
+              const feedImages = (product.images || []).filter(i => (i.types || []).includes('feed_primary') && sp.color._id === i.color).map(i => i.image);
+              const frontImages = (product.images || []).filter(i => (i.types || []).includes('front') && sp.color._id === i.color).map(i => i.image);
+              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) || {};
+              const images = getImages(backImages) || getImages(frontImages) || [];
+              const feedTitle = (product.feedTitle || '')
+                .replace(/{colour}/g, sp.color.name)
+                .replace(/{size}/g, sp.size.name)
+                .replace(/{brand}/g, product.brand.name)
+              const title = feedTitle || `${product.name} ${sp.color.name}`;
+              const description = `${product.description || product.fabricInfoShort || product.name || ''}`
+                .replace(/ /g, ' ')
+                .replace(/·/, '·');
+              const link = `https://${config.HOST_NAME}/${product.brand.alias}/${product.productType.alias}/${product.alias}?color=${sp.color.alias}`;
+              const info = {
+                title: { _text: title },
+                description: { _text: description },
+                link: { _text: link },
+                'g:id': { _text: sp.SKU },
+                'g:item_group_id': { _text: product.SKU },
+                'g:size': { _text: sp.size.name },
+                'g:size_system': 'AU',
+                'g:size_type': 'regular',
+                'g:gender': { _text: product.gender },
+                'g:material': { _text: product.fabricInfoShort },
+                'g:brand': { _text: product.brand.name },
+                'g:condition': { _text: 'new' },
+                'g:mpn': { _text: sp.SKU },
+                'g:color': { _text: sp.color.name },
+                'g:image_link': { _text: image },
+                'g:additional_image_link': images.map(i => ({ _text: i })),
+                'g:price': { _text: `${(sp.price || 0)} AUD` },
+                'g:availability': { _text: sp.quantityStock > 0 ? 'in_stock' : 'out_of_stock' },
+                'g:google_product_category': { _text: 2047 },
+                'g:product_type': { _text: `Home > Products > ${product.productType.name}`, },
+                'g:is_bundle': { _text: product.prePrint ? 'yes' : 'no' },
+                'g:identifier_exists': sp.gtin ? 'yes' : 'no',
+                'g:product_weight': { _text: `${product.weight} kg` },
+                'g:shipping_weight': { _text: `${((product.weight || 0) + (product.weight || 0) * 0.05).toFixed(3)} kg` },
+                'g:quantity': { _text: sp.quantityStock },
+                
+              };
+
+              if (sp.gtin) {
+                info['g:gtin'] = { _text: sp.gtin || '' };
+              }
+
+              if (sp.storeCode) {
+                info['g:store_code'] = { _text: sp.storeCode };
+                info['g:link_template'] = { _text: `${link}&store={store_code}` };
+                if (availableStores) {
+                  info['g:pickup_method'] = { _text: 'buy' };
+                  info['g:pickup_sla'] = { _text: product.prePrint ? 'next day' : 'same day' };
+                }
+              } else {
+                info['g:pickup_method'] = { _text: 'not_supported' };
+              }
+              if (product.volume) {
+                if (product.volume.length) {
+                  info['g:shipping_length'] = { _text: `${product.volume.length} cm` };
+                }
+                if (product.volume.width) {
+                  info['g:shipping_width'] = { _text: `${product.volume.width} cm` };
+                }
+                if (product.volume.height) {
+                  info['g:shipping_height'] = { _text: `${product.volume.height} cm` };
+                }
+              }
+              return info;
+            })
+        ];
+      }, [])
+  };
+  
+  return {
+    _declaration: { _attributes: { version: "1.0", encoding: "utf-8" } },
+    rss: {
+      _attributes: { version: "2.0", 'xmlns:g': "http://base.google.com/ns/1.0" },
+      channel: {
+        lastBuildDate: { _text: new Date().toUTCString() },
+        docs: { _text: "https://validator.w3.org/feed/docs/rss2.html" },
+        ...channel
+      },
+    },
+  }
+}
+
+module.exports = {
+  googleShoppingFeed
+};

package/feeds/index.js

@@ -0,0 +1,7 @@
+const { reviewsFeed } = require('./reviews');
+const { googleShoppingFeed } = require('./google-shopping');
+
+module.exports = {
+  reviewsFeed,
+  googleShoppingFeed
+};

package/feeds/reviews.js

@@ -0,0 +1,112 @@
+async function reviewsFeed(axios, config) {
+  const { data } = await axios.get(`${config.LOCAL_API_URL}/feed/reviews?host=${config.HOST_NAME}`);
+  
+  return {
+    _declaration: { _attributes: { version: "1.0", encoding: "utf-8" } },
+    feed: {
+      _attributes: {
+        'xmlns:vc': 'http://www.w3.org/2007/XMLSchema-versioning',
+        'xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
+        'xsi:noNamespaceSchemaLocation': 'http://www.google.com/shopping/reviews/schema/product/2.3/product_reviews.xsd'
+      },
+      version: { _text: '2.3' },
+      publisher: {
+        name: { _text: 'Workdepot Australia' },
+        favicon: { _text: 'https://www.workdepot.com.au/favicon.png' }
+      },
+      reviews: {
+        review: [
+          ...data
+            .filter(review => !!review.product)
+            .map(review => {
+              const { product } = review;
+              const productUrl = `https://${config.HOST_NAME}/${product.brand.alias}/${product.productType.alias}/${product.alias}`;
+              const item = {
+                review_id: { _text: review._id },
+                reviewer: {
+                  name: {
+                    _attributes: {
+                      is_anonymous: 'false'
+                    },
+                    _text: review.name
+                  }
+                },
+                review_timestamp: { _text: review.createdAt },
+                title: { _text: product.name },
+                content: { _text: review.text },
+                pros: {
+                  pro: (review.pro || '').split(/\n/).map(pro => ({ _text: pro }))
+                },
+                cons: {
+                  con: (review.cons || '').split(/\n/).map(cons => ({ _text: cons }))
+                },
+                review_url: {
+                  _attributes: {
+                    type: 'singleton'
+                  },
+                  _text: `${productUrl}#review-${review._id}`
+                },
+                reviewer_images: {
+                  reviewer_image: [{
+                    url: { _text: review.image?.large }
+                  }]
+                },
+                ratings: {
+                  overall: {
+                    _attributes: {
+                      min: 1,
+                      max: 5
+                    },
+                    _text: review.mark
+                  }
+                },
+                products: {
+                  product: {
+                    product_ids: {
+                      gtins: {
+                        gtin: { _text: product.simpleProduct?.gtin }
+                      },
+                      skus: {
+                        sku: { _text: product.simpleProduct?.SKU }
+                      },
+                      brands: {
+                        brand: { _text: product.brand.name }
+                      },
+                    },
+                    product_name: { _text: product.name },
+                    product_url: { _text: productUrl }
+                  }
+                },
+                is_spam: { _text: 'false' }
+              };
+
+              if (!product.simpleProduct?.gtin) {
+                delete item.products.product.product_ids.gtins;
+              }
+
+              if (!product.simpleProduct?.SKU) {
+                delete item.products.product.product_ids.skus;
+              }
+
+              if (!review.pro) {
+                delete item.pros;
+              }
+
+              if (!review.cons) {
+                delete item.cons;
+              }
+
+              if (!review.image) {
+                delete item.reviewer_images;
+              }
+              return item;
+            })
+        ]
+      }
+    }
+  };
+}
+
+module.exports = {
+  reviewsFeed
+};

package/nuxt.config.js

@@ -1,4 +1,5 @@
 const sharedRoutes = require('./routes');
+const feeds = require('./feeds');
 
 module.exports = (config, axios, { raygunClient, publicPath } = {}) => ({
   globalName: 'appLancom',
@@ -122,211 +123,12 @@ module.exports = (config, axios, { raygunClient, publicPath } = {}) => ({
   feed: [{
     path: '/pr-rev-au.xml',
     async get() {
-      const { data } = await axios.get(`${config.LOCAL_API_URL}/feed/reviews?host=${config.HOST_NAME}`);
-      
-      return {
-        _declaration: { _attributes: { version: "1.0", encoding: "utf-8" } },
-        feed: {
-          _attributes: {
-            'xmlns:vc': 'http://www.w3.org/2007/XMLSchema-versioning',
-            'xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
-            'xsi:noNamespaceSchemaLocation': 'http://www.google.com/shopping/reviews/schema/product/2.3/product_reviews.xsd'
-          },
-          version: { _text: '2.3' },
-          publisher: {
-            name: { _text: 'Workdepot Australia' },
-            favicon: { _text: 'https://www.workdepot.com.au/favicon.png' }
-          },
-          reviews: {
-            review: [
-              ...data
-                .filter(review => !!review.product)
-                .map(review => {
-                  const { product } = review;
-                  const productUrl = `https://${config.HOST_NAME}/${product.brand.alias}/${product.productType.alias}/${product.alias}`;
-                  const item = {
-                    review_id: { _text: review._id },
-                    reviewer: {
-                      name: {
-                        _attributes: {
-                          is_anonymous: 'false'
-                        },
-                        _text: review.name
-                      }
-                    },
-                    review_timestamp: { _text: review.createdAt },
-                    title: { _text: product.name },
-                    content: { _text: review.text },
-                    pros: {
-                      pro: (review.pro || '').split(/\n/).map(pro => ({ _text: pro }))
-                    },
-                    cons: {
-                      con: (review.cons || '').split(/\n/).map(cons => ({ _text: cons }))
-                    },
-                    review_url: {
-                      _attributes: {
-                        type: 'singleton'
-                      },
-                      _text: `${productUrl}#review-${review._id}`
-                    },
-                    reviewer_images: {
-                      reviewer_image: [{
-                        url: { _text: review.image?.large }
-                      }]
-                    },
-                    ratings: {
-                      overall: {
-                        _attributes: {
-                          min: 1,
-                          max: 5
-                        },
-                        _text: review.mark
-                      }
-                    },
-                    products: {
-                      product: {
-                        product_ids: {
-                          gtins: {
-                            gtin: { _text: product.simpleProduct?.gtin }
-                          },
-                          skus: {
-                            sku: { _text: product.simpleProduct?.SKU }
-                          },
-                          brands: {
-                            brand: { _text: product.brand.name }
-                          },
-                        },
-                        product_name: { _text: product.name },
-                        product_url: { _text: productUrl }
-                      }
-                    },
-                    is_spam: { _text: 'false' }
-                  };
-
-                  if (!product.simpleProduct?.gtin) {
-                    delete item.products.product.product_ids.gtins;
-                  }
-
-                  if (!product.simpleProduct?.SKU) {
-                    delete item.products.product.product_ids.skus;
-                  }
-
-                  if (!review.pro) {
-                    delete item.pros;
-                  }
-
-                  if (!review.cons) {
-                    delete item.cons;
-                  }
-
-                  if (!review.image) {
-                    delete item.reviewer_images;
-                  }
-                  return item;
-                })
-            ]
-          }
-        }
-      };
+      return await feeds.reviewsFeed(axios, config);
     }
   }, {
     path: '/google-shopping.xml',
     async get() {
-      const { data } = await axios.get(`${config.LOCAL_API_URL}/feed/products?host=${config.HOST_NAME}`);
-      const spliceFirstImage = images => (images || []).splice(0, 1)[0];
-      const getImages = images => (images || []).length > 0 ? images : null;
-      const channel = {
-        title: { _text: 'All products' },
-        link: { _text: `https://${config.HOST_NAME}` },
-        generator: { _text: config.HOST_NAME },
-        item: data.reduce((items, product) => {
-          return [
-            ...items,
-            ...(product.simpleProducts || []).map(sp => {
-              const feedImages = (product.images || []).filter(i => (i.types || []).includes('feed_primary') && sp.color._id === i.color).map(i => i.image);
-              const frontImages = (product.images || []).filter(i => (i.types || []).includes('front') && sp.color._id === i.color).map(i => i.image);
-              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) || {};
-              const images = getImages(backImages) || getImages(frontImages) || [];
-              const feedTitle = (product.feedTitle || '')
-                .replace(/{colour}/g, sp.color.name)
-                .replace(/{size}/g, sp.size.name)
-                .replace(/{brand}/g, product.brand.name)
-              const title = feedTitle || `${product.name} ${sp.color.name}`;
-              const description = `${product.description || product.fabricInfoShort || product.name || ''}`
-                .replace(/ /g, ' ')
-                .replace(/·/, '·');
-              const link = `https://${config.HOST_NAME}/${product.brand.alias}/${product.productType.alias}/${product.alias}?color=${sp.color.alias}`;
-              const info = {
-                title: { _text: title },
-                description: { _text: description },
-                link: { _text: link },
-                'g:id': { _text: sp.SKU },
-                'g:item_group_id': { _text: product.SKU },
-                'g:size': { _text: sp.size.name },
-                'g:size_system': 'AU',
-                'g:size_type': 'regular',
-                'g:gender': { _text: product.gender },
-                'g:material': { _text: product.fabricInfoShort },
-                'g:brand': { _text: product.brand.name },
-                'g:condition': { _text: 'new' },
-                'g:mpn': { _text: sp.SKU },
-                'g:color': { _text: sp.color.name },
-                'g:image_link': { _text: image },
-                'g:additional_image_link': images.map(i => ({ _text: i })),
-                'g:price': { _text: `${(sp.price || 0)} AUD` },
-                'g:availability': { _text: sp.quantityStock > 0 ? 'in_stock' : 'out_of_stock' },
-                'g:google_product_category': { _text: 2047 },
-                'g:product_type': { _text: `Home > Products > ${product.productType.name}`, },
-                'g:is_bundle': { _text: product.prePrint ? 'yes' : 'no' },
-                'g:identifier_exists': sp.gtin ? 'yes' : 'no',
-                'g:product_weight': { _text: `${product.weight} kg` },
-                'g:shipping_weight': { _text: `${((product.weight || 0) + (product.weight || 0) * 0.05).toFixed(3)} kg` },
-                'g:quantity': { _text: sp.quantityStock },
-                
-              };
-
-              if (sp.gtin) {
-                info['g:gtin'] = { _text: sp.gtin || '' };
-              }
-
-              if (sp.storeCode) {
-                info['g:store_code'] = { _text: sp.storeCode };
-                info['g:link_template'] = { _text: `${link}&store={store_code}` };
-                info['g:pickup_method'] = { _text: 'buy' };
-                info['g:pickup_sla'] = { _text: 'next day' };
-              } else {
-                info['g:pickup_method'] = { _text: 'not_supported' };
-              }
-              if (product.volume) {
-                if (product.volume.length) {
-                  info['g:shipping_length'] = { _text: `${product.volume.length} cm` };
-                }
-                if (product.volume.width) {
-                  info['g:shipping_width'] = { _text: `${product.volume.width} cm` };
-                }
-                if (product.volume.height) {
-                  info['g:shipping_height'] = { _text: `${product.volume.height} cm` };
-                }
-              }
-              return info;
-            })
-          ];
-        }, [])
-      };
-      
-      return {
-        _declaration: { _attributes: { version: "1.0", encoding: "utf-8" } },
-        rss: {
-          _attributes: { version: "2.0", 'xmlns:g': "http://base.google.com/ns/1.0" },
-          channel: {
-            lastBuildDate: { _text: new Date().toUTCString() },
-            docs: { _text: "https://validator.w3.org/feed/docs/rss2.html" },
-            ...channel
-          },
-        },
-      }
+      return await feeds.googleShoppingFeed(axios, config);
     }
   }],
   router: {

package/package.json

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

package/store/product.js

@@ -196,6 +196,9 @@ export const actions = {
     const response = await api.fetchPrintTypes(shop);
     commit('setPrintTypes', response);
   },
+  async updatePriceIncludeGST({ commit }, value) {
+    commit('setPriceIncludeGST', value);
+  },
   async calculateProductPrice({ state: { template, product, isPrintPricing }, commit, getters }, shop) {
     commit('setCalculatingPrice', true);
     const entities = getProductsForCalculatePricing(product, getters.usedSimpleProducts, template.layers, isPrintPricing, true);