@lancom/shared 0.0.261 → 0.0.263

package/feeds/google-shopping.js

@@ -65,14 +65,13 @@ async function googleShoppingFeed(axios, config, availableStores) {
                 '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:google_product_category': { _text: product.feedGoogleProductCategory || 2047 },
+                'g:product_type': { _text: product.feedProductType || `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) {
@@ -101,6 +100,51 @@ async function googleShoppingFeed(axios, config, availableStores) {
                   info['g:shipping_height'] = { _text: `${product.volume.height} cm` };
                 }
               }
+
+              const productHighlight = `${product.feedProductHighlight || ''}`
+                .trim()
+                .split(/\n+/g)
+                .map(highlight => `${highlight || ''}`.trim())
+                .filter(highlight => !!highlight);
+              if (productHighlight.length > 0) {
+                info['g:product_highlight'] = productHighlight.map(highlight => ({ _text: highlight }));
+              }
+
+              if ((product.feedProductDetails || []).length > 0) {
+                info['g:product_detail'] = product.feedProductDetails.map(productDetail => {
+                  const detail = {
+                    'g:attribute_name': { _text: productDetail.attributeName },
+                    'g:attribute_value': { _text: productDetail.attributeValue },
+                  }
+                  if (productDetail.sectionName) {
+                    detail['g:section_name'] = productDetail.sectionName;
+                  }
+
+                  return detail;
+                });
+              }
+
+              if ((product.feedCertifications || []).length > 0) {
+                info['g:certification'] = product.feedCertifications.map(certification => {
+                  const detail = {
+                    'g:certification_authority': { _text: certification.certificationAuthority },
+                    'g:certification_name': { _text: certification.certificationName },
+                    'g:certification_code': { _text: certification.certificationCode },
+                  }
+                  return detail;
+                });
+              }
+
+              for (let label = 0; label <= 4; label++) {
+                if (product[`feedCustomLabel${label}`]) {
+                  info[`custom_label_${label}`] = { _text: product[`feedCustomLabel${label}`] };
+                }
+              }
+
+              if (product.feedLifestyleImage) {
+                info['g:lifestyle_image_link'] = { _text: product.feedLifestyleImage };
+              }
+
               return info;
             })
         ];

package/mixins/meta-info.js

@@ -34,10 +34,7 @@ const metaInfo = {
     }
   },
   head() {
-    const hasQueryParams = Object
-      .keys(this.$route.query || {})
-      .filter(key => !['color', 'store'].includes(`${key || ''}`.toLowerCase()))
-      .length > 0;
+    const hasQueryParams = Object.keys(this.$route.query || {}).length > 0;
 
     const { short_text: shortText, image, meta = {} } = this.routeInfo || {};
     const pageItemMeta = this.pageItem?.meta || {};

package/mixins/products-price.js

@@ -22,7 +22,7 @@ const productsPrice = {
     };
   },
   computed: {
-    ...mapGetters(['pricingSettings', 'shop', 'country']),
+    ...mapGetters(['pricingSettings', 'shop']),
     printsPricing() {
       const pricing = {};
       if (this.productPricing) {
@@ -72,8 +72,7 @@ const productsPrice = {
       const playload = {
         products: this.calcProducts,
         postcode: this.postcode,
-        screenPrint: this.screenPrint,
-        country: this.country?._id
+        screenPrint: this.screenPrint
       };
       this.productPricing = await api.calculateProductPrice(playload, this.shop._id);
     }

package/package.json

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

package/plugins/cache-headers.js

@@ -1,6 +1,10 @@
 module.exports = function (req, res, next) {
   if (!/auth\=/.test(req.headers?.cookie || '')) {
-    const value = !!`${req.url}`.match(/^\/quotes\//) ? 'no-cache' : `max-age=${31536000}`;
+    const routes = [
+      /^\/quotes\//,
+      /\.xml$/
+    ];
+    const value = routes.some(route => route.test(`${req.url}`)) ? 'no-cache' : `max-age=${31536000}`;
     res.setHeader('Cache-Control', value);
   } else {
     res.setHeader('Cache-Control', 'no-cache');

package/store/cart.js

@@ -148,9 +148,9 @@ export const actions = {
     await api.saveCart(payload, shop._id);
     commit('setEntities', entities);
   },
-  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, commit }, { shop, country }) {
+  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, commit }, { shop }) {
     const selectedSuppliersWithRates = cartPricing?.shipping?.suppliersWithRates;
-    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates, country);
+    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates);
     try {
       commit('setCartPricingCalculating', true);
       const response = await api.calculateProductPrice(payload, shop._id);
@@ -179,7 +179,7 @@ export const actions = {
   clearCart({ commit }) {
     commit('clearCart');
   },
-  async selectRate({ state: { cartPricing, entities, suburb, coupon }, commit }, { supplier, rate, shop, country }) {
+  async selectRate({ state: { cartPricing, entities, suburb, coupon }, commit }, { supplier, rate, shop }) {
     const suppliersWithRates = cartPricing.shipping.suppliersWithRates
       .map(supplierWithRates => ({
         ...(
@@ -190,7 +190,7 @@ export const actions = {
               })
             : supplierWithRates)
       }));
-    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, null, country);
+    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon);
     try {
       commit('setCartPricingCalculating', true);
       const response = await api.calculateProductPrice(payload, shop._id);
@@ -245,7 +245,7 @@ export const mutations = {
   }
 };
 
-function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, selectedSuppliersWithRates, country) {
+function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, selectedSuppliersWithRates) {
   const getSimpleObj = i => i && ({ _id: i._id, name: i.name });
   return {
     entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
@@ -285,7 +285,6 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon
     address: suburb ? [suburb.locality, suburb.state, suburb.postcode].filter(i => !!i).join(', ') : null,
     coupon,
     suppliersWithRates,
-    selectedSuppliersWithRates,
-    country: country?._id
+    selectedSuppliersWithRates
   };
 }

package/store/index.js

@@ -35,7 +35,6 @@ export const getters = {
   pricingSettings: ({ pricing }) => pricing || {},
   orderSettings: ({ orderInfo }) => orderInfo || {},
   gstTax: ({ pricing }) => pricing?.gstTax || 0,
-  taxName: ({ pricing }) => pricing?.taxName || 'GST',
   displayPricingWithTax: ({ pricing }) => !!pricing?.displayPricingWithTax,
   screenPrintsPrices: ({ pricing }) => pricing?.screenPrintsPrices || {},
   depositInfo: ({ depositInfo }) => depositInfo || {}
@@ -56,15 +55,14 @@ export const actions = {
     commit('setCountry', settings.country);
     commit('setCurrency', settings.currency);
 
-    const countrySettings = (shop.countries || []).find(c => c.country?._id === settings.country?._id) || { settings: [] };
-      
     if (process.env.PINPAYMENT_PUBLISHABLE_API_KEY) {
       commit('setPayment', {
         type: 'pinpayment',
         clientKey: process.env.PINPAYMENT_PUBLISHABLE_API_KEY
       });
     } else {
-      const countrySetting = (countrySettings?.settings || []).find(s => !!s.settings.app.STRIPE_PUBLIC_KEY);
+      const countrySettings = (shop.countries || []).find(c => c.country?._id === settings.country?._id) || { settings: [] };
+      const countrySetting = countrySettings.settings.find(s => !!s.settings.app.STRIPE_PUBLIC_KEY);
       if (countrySetting) {
         commit('setPayment', {
           type: 'stripe',
@@ -73,13 +71,6 @@ export const actions = {
       }
     }
 
-
-    const pricingSetting = (countrySettings?.settings || []).find(s => !!s.settings.pricing);
-    commit('setPricing', {
-      ...shop.settings.pricing,
-      ...(pricingSetting?.settings?.pricing || {})
-    });
-
     // }
     try {
       if (req.headers.cookie) {
@@ -108,7 +99,7 @@ export const actions = {
             commit('cart/setCoupon', coupon);
           } catch (e) {}
         }
-        dispatch('cart/calculateCartPrice', { shop, country });
+        dispatch('cart/calculateCartPrice', { shop });
       }
     }
     const closedNotification = localStorage.getItem(CLOSED_NOTIFICATION);
@@ -130,17 +121,15 @@ export const mutations = {
   setPayment(state, payment) {
     state.payment = payment;
   },
-  setPricing(state, pricing) {
-    state.pricing = pricing;
-  },
   setCountry(state, country) {
     state.country = country;
   },
   setCurrency(state, currency) {
     state.currency = currency;
   },
-  setSettings(state, { contacts, notificationBar, discountPopup, order, depositInfo }) {
+  setSettings(state, { contacts, pricing, notificationBar, discountPopup, order, depositInfo }) {
     state.contacts = contacts;
+    state.pricing = pricing;
     state.orderInfo = order;
     state.notificationBar = notificationBar;
     state.discountPopup = discountPopup;

package/store/product.js

@@ -160,7 +160,6 @@ export const actions = {
         commit('setSelectedPrintArea', { printArea: first._id, size: first.printSize });
       }
     } catch (e) {
-      console.log(e);
       const { status, data } = e?.response || {};
       const statusCode = status || 500;
       commit('setLoadError', {
@@ -200,10 +199,10 @@ export const actions = {
   async updatePriceIncludeGST({ commit }, value) {
     commit('setPriceIncludeGST', value);
   },
-  async calculateProductPrice({ state: { template, product, isPrintPricing }, commit, getters }, { shop, country }) {
+  async calculateProductPrice({ state: { template, product, isPrintPricing }, commit, getters }, shop) {
     commit('setCalculatingPrice', true);
     const entities = getProductsForCalculatePricing(product, getters.usedSimpleProducts, template.layers, isPrintPricing, true);
-    const response = await api.calculateProductPrice({ entities, country: country?._id }, shop._id);
+    const response = await api.calculateProductPrice({ entities }, shop._id);
     commit('setProductPricing', response);
     commit('setCalculatingPrice', false);
   },