@lancom/shared 0.0.266 → 0.0.267

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

@@ -10,21 +10,20 @@
     right: 0;
     top: 41px;
     padding: 10px;
-    background-color: white;
-    border: 1px solid $medium_gray;
-    z-index: 999;
+    background-color: $black;
+    color: $white;
   }
   &__result-item {
     padding-bottom: 10px;
     margin-bottom: 10px;
-    border-bottom: 1px solid $medium_gray;
+    border-bottom: 1px solid $gray_main;
     &:last-child {
       border-bottom: none;
       margin-bottom: 0px;
     }
     ::v-deep {
       a {
-        color: $gray_main;
+        color: $white;
         font-size: 13px;
         text-decoration: none;
       }
@@ -34,22 +33,24 @@
       padding: 10px;
       text-align: center;
       display: block;
-      background-color: $black;
-      color: $white !important;
+      background-color: $white;
       &:hover {
-        background-color: $white;
-        color: $black !important;
+        background-color: $black;
+        color: $white;
       }
     }
   }
   &__input {
     input {
-      border-color: $medium_gray;
+      background-color: #535353;
+      border: none;
       border-radius: 0px;
+      color: $white;
       height: 41px;
       position: relative;
       z-index: 1;
       &::placeholder {
+        font-weight: 600;
         font-size: 14px;
         color: $grey_3;
       }
@@ -60,6 +61,7 @@
       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: null
+          country: 'Australia'
         },
         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 {{ 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>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>
   </div>
 </template>
@@ -40,8 +40,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'gstTax',
-      'taxName'
+      'gstTax'
     ])
   },
   methods: {

package/feeds/google-shopping.js

@@ -96,10 +96,10 @@ async function googleShoppingFeed(axios, config, availableStores) {
               }
               if (product.volume) {
                 if (product.volume.length) {
-                  info['g:shipping_length'] = { _text: `${parseInt(product.volume.length * (sp.multipackQty || 1))} cm` };
+                  info['g:shipping_length'] = { _text: `${parseInt(product.volume.length)} cm` };
                 }
                 if (product.volume.width) {
-                  info['g:shipping_width'] = { _text: `${parseInt(product.volume.width * (sp.multipackQty || 1))} cm` };
+                  info['g:shipping_width'] = { _text: `${parseInt(product.volume.width)} cm` };
                 }
                 if (product.volume.height) {
                   info['g:shipping_height'] = { _text: `${parseInt(product.volume.height * (sp.multipackQty || 1))} cm` };

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.266",
+  "version": "0.0.267",
   "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, 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

@@ -67,6 +67,7 @@ export const getters = {
   hasLayers: ({ template }) => (template.layers || []).length > 0,
   visibleSteps: ({ template }) => template.visibleSteps,
   simpleProducts: ({ template }) => template.simpleProducts || [],
+  editableColorSimpleProducts: ({ template, editableColor }) => (template.simpleProducts || []).filter(sp => sp.color._id === editableColor._id),
   usedSimpleProducts: ({ template }) => (template.simpleProducts || []).filter(p => p.amount > 0),
   usedSimpleProductsQuantity: ({ template }) => (template.simpleProducts || []).filter(p => p.amount > 0).reduce((sum, { amount }) => sum + amount, 0),
   usedBigSizeSimpleProductsQuantity: (state, { usedSimpleProducts }) => filterBigSize(usedSimpleProducts).reduce((sum, { amount }) => sum + amount, 0),
@@ -160,7 +161,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 +200,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);
   },
@@ -410,6 +410,12 @@ export const mutations = {
       Vue.set(state.template.simpleProducts, index, simpleProduct);
     }
   },
+  clearSimpleProductsAmount(state) {
+    state.template.simpleProducts.forEach((simpleProduct, index) => {
+      Vue.set(simpleProduct, 'amount', 0);
+      Vue.set(state.template.simpleProducts, index, simpleProduct);
+    })
+  },
   setProductPricing(state, price) {
     state.productPricing = price;
   },