@lancom/shared 0.0.264 → 0.0.266

package/components/products/products_autocomplete/products-autocomplete.scss

@@ -10,20 +10,21 @@
     right: 0;
     top: 41px;
     padding: 10px;
-    background-color: $black;
-    color: $white;
+    background-color: white;
+    border: 1px solid $medium_gray;
+    z-index: 999;
   }
   &__result-item {
     padding-bottom: 10px;
     margin-bottom: 10px;
-    border-bottom: 1px solid $gray_main;
+    border-bottom: 1px solid $medium_gray;
     &:last-child {
       border-bottom: none;
       margin-bottom: 0px;
     }
     ::v-deep {
       a {
-        color: $white;
+        color: $gray_main;
         font-size: 13px;
         text-decoration: none;
       }
@@ -33,24 +34,22 @@
       padding: 10px;
       text-align: center;
       display: block;
-      background-color: $white;
+      background-color: $black;
+      color: $white !important;
       &:hover {
-        background-color: $black;
-        color: $white;
+        background-color: $white;
+        color: $black !important;
       }
     }
   }
   &__input {
     input {
-      background-color: #535353;
-      border: none;
+      border-color: $medium_gray;
       border-radius: 0px;
-      color: $white;
       height: 41px;
       position: relative;
       z-index: 1;
       &::placeholder {
-        font-weight: 600;
         font-size: 14px;
         color: $grey_3;
       }
@@ -61,7 +60,6 @@
       right: 10px;
       font-size: 17px;
       pointer-events: none;
-      color: $white;
       &.icon-search {
         z-index: 2;
         pointer-events: all;

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

@@ -354,7 +354,7 @@ export default {
           email: '',
           phone: '',
           suburb: null,
-          country: 'Australia'
+          country: null
         },
         expectedItemsQuantity: null,
         description: '',

package/components/quotes/quote_view/quote_option_view/quote-option-view.vue

@@ -11,9 +11,9 @@
       <div>Products Total: <b>{{ option.productsTotal | price(currency) }}</b></div>
       <div>Prints Total: <b>{{ option.printsTotal | price(currency) }}</b></div>
       <div>Shipping Total: <b>{{ option.shippingTotal | price(currency) }}</b></div>
-      <div>Total ex GST: <b>{{ option.total | price(currency) }}</b></div>
-      <div>GST: <b>{{ optionGst(option) | price(currency) }}</b></div>
-      <div>Total inc GST: <b>{{ option.total | tax(gstTax) | price(currency) }}</b></div>
+      <div>Total ex {{ taxName }}: <b>{{ option.total | price(currency) }}</b></div>
+      <div>{{ taxName }}: <b>{{ optionGst(option) | price(currency) }}</b></div>
+      <div>Total inc {{ taxName }}: <b>{{ option.total | tax(gstTax) | price(currency) }}</b></div>
     </div>
   </div>
 </template>
@@ -40,7 +40,8 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'gstTax'
+      'gstTax',
+      'taxName'
     ])
   },
   methods: {

package/feeds/google-shopping.js

@@ -35,7 +35,7 @@ async function googleShoppingFeed(axios, config, availableStores) {
               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 image = spliceFirstImage(feedImages) || spliceFirstImage(frontImages) || spliceFirstImage(catalogFrontImages) || spliceFirstImage(backImages) || null;
               const images = getImages(backImages) || getImages(frontImages) || [];
               const feedTitle = (product.feedTitle || '')
                 .replace(/{colour}/g, sp.color.name)
@@ -45,10 +45,15 @@ async function googleShoppingFeed(axios, config, availableStores) {
               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}`;
+              let link = `https://${config.HOST_NAME}/${product.brand.alias}/${product.productType.alias}/${product.alias}?color=${sp.color.alias}`;
+              if (sp.multipackQty) {
+                link = `${link}&multipack=${sp.SKU}`
+              }
+
+              const productWeight = +((product.weight || 0) * (sp.multipackQty || 1)).toFixed(3);
               const info = {
-                title: { _text: title },
-                description: { _text: description },
+                title: { _text: sp.title || title },
+                description: { _text: sp.description || description },
                 link: { _text: link },
                 'g:id': { _text: sp.SKU },
                 'g:item_group_id': { _text: product.SKU },
@@ -61,16 +66,16 @@ async function googleShoppingFeed(axios, config, availableStores) {
                 '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:image_link': { _text: sp.image || image },
+                'g:additional_image_link': (sp.image ? [image, ...images] : 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: product.feedGoogleProductCategory || 2047 },
                 'g:product_type': { _text: product.feedProductType || `Home > Products > ${product.productType.name}`, },
                 'g:is_bundle': { _text: '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:product_weight': { _text: `${productWeight} kg` },
+                'g:shipping_weight': { _text: `${(productWeight + productWeight * 0.05).toFixed(3)} kg` },
                 'g:quantity': { _text: sp.quantityStock },
               };
 
@@ -91,13 +96,13 @@ async function googleShoppingFeed(axios, config, availableStores) {
               }
               if (product.volume) {
                 if (product.volume.length) {
-                  info['g:shipping_length'] = { _text: `${product.volume.length} cm` };
+                  info['g:shipping_length'] = { _text: `${parseInt(product.volume.length * (sp.multipackQty || 1))} cm` };
                 }
                 if (product.volume.width) {
-                  info['g:shipping_width'] = { _text: `${product.volume.width} cm` };
+                  info['g:shipping_width'] = { _text: `${parseInt(product.volume.width * (sp.multipackQty || 1))} cm` };
                 }
                 if (product.volume.height) {
-                  info['g:shipping_height'] = { _text: `${product.volume.height} cm` };
+                  info['g:shipping_height'] = { _text: `${parseInt(product.volume.height * (sp.multipackQty || 1))} cm` };
                 }
               }
 

package/mixins/meta-info.js

@@ -34,7 +34,10 @@ const metaInfo = {
     }
   },
   head() {
-    const hasQueryParams = Object.keys(this.$route.query || {}).length > 0;
+    const hasQueryParams = Object
+      .keys(this.$route.query || {})
+      .filter(key => !['color', 'store'].includes(`${key || ''}`.toLowerCase()))
+      .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']),
+    ...mapGetters(['pricingSettings', 'shop', 'country']),
     printsPricing() {
       const pricing = {};
       if (this.productPricing) {
@@ -72,7 +72,8 @@ const productsPrice = {
       const playload = {
         products: this.calcProducts,
         postcode: this.postcode,
-        screenPrint: this.screenPrint
+        screenPrint: this.screenPrint,
+        country: this.country?._id
       };
       this.productPricing = await api.calculateProductPrice(playload, this.shop._id);
     }

package/package.json

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

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 }) {
+  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, commit }, { shop, country }) {
     const selectedSuppliersWithRates = cartPricing?.shipping?.suppliersWithRates;
-    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates);
+    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates, country);
     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 }) {
+  async selectRate({ state: { cartPricing, entities, suburb, coupon }, commit }, { supplier, rate, shop, country }) {
     const suppliersWithRates = cartPricing.shipping.suppliersWithRates
       .map(supplierWithRates => ({
         ...(
@@ -190,7 +190,7 @@ export const actions = {
               })
             : supplierWithRates)
       }));
-    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon);
+    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, null, country);
     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) {
+function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon, selectedSuppliersWithRates, country) {
   const getSimpleObj = i => i && ({ _id: i._id, name: i.name });
   return {
     entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
@@ -285,6 +285,7 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon
     address: suburb ? [suburb.locality, suburb.state, suburb.postcode].filter(i => !!i).join(', ') : null,
     coupon,
     suppliersWithRates,
-    selectedSuppliersWithRates
+    selectedSuppliersWithRates,
+    country: country?._id
   };
 }

package/store/index.js

@@ -35,6 +35,7 @@ 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 || {}
@@ -55,14 +56,15 @@ 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 countrySettings = (shop.countries || []).find(c => c.country?._id === settings.country?._id) || { settings: [] };
-      const countrySetting = countrySettings.settings.find(s => !!s.settings.app.STRIPE_PUBLIC_KEY);
+      const countrySetting = (countrySettings?.settings || []).find(s => !!s.settings.app.STRIPE_PUBLIC_KEY);
       if (countrySetting) {
         commit('setPayment', {
           type: 'stripe',
@@ -71,6 +73,13 @@ 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) {
@@ -99,7 +108,7 @@ export const actions = {
             commit('cart/setCoupon', coupon);
           } catch (e) {}
         }
-        dispatch('cart/calculateCartPrice', { shop });
+        dispatch('cart/calculateCartPrice', { shop, country });
       }
     }
     const closedNotification = localStorage.getItem(CLOSED_NOTIFICATION);
@@ -121,15 +130,17 @@ 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, pricing, notificationBar, discountPopup, order, depositInfo }) {
+  setSettings(state, { contacts, notificationBar, discountPopup, order, depositInfo }) {
     state.contacts = contacts;
-    state.pricing = pricing;
     state.orderInfo = order;
     state.notificationBar = notificationBar;
     state.discountPopup = discountPopup;

package/store/product.js

@@ -160,6 +160,7 @@ 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', {
@@ -199,10 +200,10 @@ export const actions = {
   async updatePriceIncludeGST({ commit }, value) {
     commit('setPriceIncludeGST', value);
   },
-  async calculateProductPrice({ state: { template, product, isPrintPricing }, commit, getters }, shop) {
+  async calculateProductPrice({ state: { template, product, isPrintPricing }, commit, getters }, { shop, country }) {
     commit('setCalculatingPrice', true);
     const entities = getProductsForCalculatePricing(product, getters.usedSimpleProducts, template.layers, isPrintPricing, true);
-    const response = await api.calculateProductPrice({ entities }, shop._id);
+    const response = await api.calculateProductPrice({ entities, country: country?._id }, shop._id);
     commit('setProductPricing', response);
     commit('setCalculatingPrice', false);
   },