@lancom/shared 0.0.123 → 0.0.124

package/assets/js/utils/cart.js

@@ -3,7 +3,7 @@ import { sortBySize } from './sizes';
 export function groupSimpleProducts(entity, isGroupByColor, isPopulateEmptyProducts = false, onlyColors) {
   const groups = new Map();
   (entity.simpleProducts || [])
-    .filter(sp => (isGroupByColor && onlyColors) ? onlyColors.some(c => c._id === sp.color._id) : true)
+    .filter(sp => (isGroupByColor && onlyColors) ? onlyColors.some(c => sp.color && c._id === sp.color._id) : true)
     .forEach(simpleProduct => {
       const key = isGroupByColor ? simpleProduct.color._id : simpleProduct.guid;
       const defaultGroup = {

package/components/common/postcode_select/postcode-select.vue

@@ -67,7 +67,8 @@
       <slot></slot>
       <span
         v-if="errors.length"
-        class="form-help is-danger">
+        class="form-help is-danger invalid-feedback"
+        style="display: block">
         {{ errors[0] }}
       </span>
     </validation-provider>
@@ -122,7 +123,7 @@ export default {
   computed: {
     model: {
       get() {
-        return this.selected;
+        return this.selected?.value ? this.selected : null;
       },
       set(option) {
         this.selected = option;

package/components/common/pricing_table/pricing-table.vue

@@ -37,7 +37,7 @@
 <script>
 import get from 'lodash.get';
 import { mapGetters } from 'vuex';
-import { priceWithTax } from '@lancom/shared/assets/js/utils/filters';
+import { priceWithTax, price } from '@lancom/shared/assets/js/utils/filters';
 
 export default {
   name: 'PricingTable',
@@ -63,6 +63,10 @@ export default {
     },
     trLabel: {
       type: String
+    },
+    withGst: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
@@ -134,7 +138,7 @@ export default {
       const printType = this.items.find(item => printTypeName === get(item, this.nameAttr));
       const pricing = get(printType, this.pricingAttr);
       const item = pricing.find(({ min, max }) => (!min || range.min >= min) && (!max || range.min <= max));
-      return item ? priceWithTax(item.price, this.pricingSettings) : '-';
+      return item ? (this.withGst ? priceWithTax(item.price, this.pricingSettings) : price(item.price)) : '-';
     }
   }
 };

package/components/faq/faq.vue

@@ -84,7 +84,7 @@ export default {
       default: true
     },
     preopenedGroup: {
-      type: Object
+      type: String
     },
     preopenedEntity: {
       type: String

package/components/product/product_prints_price_info/product-prints-price-info.scss

@@ -55,4 +55,9 @@
     color: $gray_main;
     line-height: 23px;
   }
+  &__toggle-gst {
+    display: flex;
+    justify-content: flex-end;
+    padding: 0 0 10px 0;
+  }
 }

package/components/product/product_prints_price_info/product-prints-price-info.vue

@@ -1,5 +1,10 @@
 <template>
   <div class="ProductPrintsPriceInfo__wrapper">
+    <div class="ProductPrintsPriceInfo__toggle-gst">
+      <checkbox v-model="inclGST">
+        <div class="ml-5">Inc. GST</div>
+      </checkbox>
+    </div>
     <tabs
       v-if="avilableTabs.length > 0"
       :tabs="avilableTabs"
@@ -9,11 +14,13 @@
       <template #default="{ currentTab }">
         <product-screen-print-price-info
           v-if="currentTab === 'screen print'"
-          :product="product" />
+          :product="product"
+          :with-gst="inclGST" />
         <product-print-price-info
           v-else-if="currentTab"
           :product="product"
-          :type="currentTab" />
+          :type="currentTab"
+          :with-gst="inclGST" />
         <div
           v-if="currentPrintTypeMessage"
           class="ProductPrintsPriceInfo__print-description"
@@ -51,6 +58,7 @@ export default {
   },
   data() {
     return {
+      inclGST: false,
       orderPrintTypes: PRINT_TYPES_LIST,
       tabs: [{
         label: 'Black',

package/components/product/product_prints_price_info/product_print_price_info/product-print-price-info.vue

@@ -3,7 +3,8 @@
     <product-print-price-info-item
       v-for="print of prints"
       :key="print._id"
-      :print="print" />
+      :print="print"
+      :with-gst="withGst" />
   </div>
 </template>
 
@@ -24,6 +25,10 @@ export default {
     type: {
       type: String,
       required: true
+    },
+    withGst: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {

package/components/product/product_prints_price_info/product_print_price_info/product_print_price_info_item/product-print-price-info-item.vue

@@ -7,11 +7,12 @@
     </div>
     <pricing-table
       :items="pricing"
-      :bordered="bordered" />
+      :bordered="bordered"
+      :with-gst="withGst" />
     <div
-      v-if="print.setupCost > 0"
+      v-if="setupCost > 0"
       class="mt-10 lc_h4">
-      Setup Cost: {{ print.setupCost | price }}
+      Setup Cost: {{ setupCost | price }}
     </div>
     <div
       v-if="print.freeSetupOver > 0"
@@ -22,8 +23,9 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import PricingTable from '@lancom/shared/components/common/pricing_table/pricing-table';
-import { price } from '@lancom/shared/assets/js/utils/filters';
+import { price, tax } from '@lancom/shared/assets/js/utils/filters';
 
 export default {
   name: 'ProductPrintPriceInfoItem',
@@ -45,12 +47,21 @@ export default {
     bordered: {
       type: Boolean,
       default: false
+    },
+    withGst: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
+    ...mapGetters(['gstTax']),
     printAreas() {
       return this.print?.printAreas || [];
     },
+    setupCost() {
+      const setupCost = print?.setupCost || 0;
+      return this.withGst ? tax(setupCost, this.gstTax) : setupCost;
+    },
     pricing() {
       return this.printAreas
         .reduce((sizes, area) => {

package/components/product/product_prints_price_info/product_screen_print_price_info/product-screen-print-price-info.vue

@@ -22,10 +22,12 @@
     <div v-if="!tabs || activeWithUnderbase">
       <pricing-table
         :items="withUnderbasePricing"
-        :bordered="bordered" />
+        :bordered="bordered"
+        :with-gst="withGst" />
       <pricing-table
         :items="withUnderbaseSetupPricing"
         :bordered="bordered"
+        :with-gst="withGst"
         tr-label="Setup Cost"
         class="mt-10" />
     </div>
@@ -37,10 +39,12 @@
     <div v-if="!tabs || !activeWithUnderbase">
       <pricing-table
         :items="withoutUnderbasePricing"
-        :bordered="bordered" />
+        :bordered="bordered"
+        :with-gst="withGst" />
       <pricing-table
         :items="withoutUnderbaseSetupPricing"
         :bordered="bordered"
+        :with-gst="withGst"
         tr-label="Setup Cost"
         class="mt-10" />
     </div>
@@ -69,6 +73,10 @@ export default {
     tabs: {
       type: Boolean,
       default: false
+    },
+    withGst: {
+      type: Boolean,
+      default: true
     }
   },
   data() {

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

@@ -36,6 +36,8 @@
       border-radius: 0px;
       color: $white;
       height: 41px;
+      position: relative;
+      z-index: 1;
       &::placeholder {
         font-weight: 600;
         font-size: 14px;
@@ -49,6 +51,11 @@
       font-size: 17px;
       pointer-events: none;
       color: $white;
+      &.icon-search {
+        z-index: 2;
+        pointer-events: all;
+        cursor: pointer;
+      }
     }
   }
 }

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

@@ -14,8 +14,11 @@
         spellcheck="false"
         @input="searchWithDebounce"
         @focus="showResults"
-        @blur="hideResults" />
-      <i class="icon-search"></i>
+        @blur="hideResults"
+        @keydown.enter="goToSearch" />
+      <i
+        class="icon-search"
+        @click="goToSearch"></i>
     </div>
     <div
       v-if="text && visibleResult && (searching || hasProducts)"
@@ -70,6 +73,9 @@ export default {
     }
   },
   methods: {
+    goToSearch() {
+      this.$router.push(`/products?text=${this.text}`);
+    },
     showResults() {
       clearTimeout(this.hideTimer);
       this.visibleResult = true;

package/components/quotes/quote_view/quote_product_prints/quote_product_print/quote-product-print.vue

@@ -54,6 +54,13 @@ export default {
     }
   },
   computed: {
+    isMultiplePrint() {
+      return (this.print.products || []).length > 0;
+    },
+    isMultiplePrintMainProduct() {
+      const products = this.print.products || [];
+      return products.indexOf(this.entity.guid) === 0 || products.indexOf(this.entity._id) === 0;
+    },
     simpleProducts() {
       return (this.entity.simpleProducts || []).filter(sp => sp.amount > 0);
     },
@@ -67,7 +74,7 @@ export default {
       return (this.print.costType === 'setup only' || this.isFreeSetup) ? 0 : (this.print.printCost || 0);
     },
     setupCost() {
-      return this.print.costType === 'item cost only' ? 0 : (this.print.setupCost || 0);
+      return (this.isMultiplePrint && !this.isMultiplePrintMainProduct) ? 0 : this.print.costType === 'item cost only' ? 0 : (this.print.setupCost || 0);
     },
     total() {
       return this.amount * this.printCost + this.setupCost;

package/components/quotes/quote_view/quote_view_product/quote-view-product.vue

@@ -107,9 +107,12 @@ export default {
     },
     totalPrice() {
       const printsTotal = (this.product.prints || []).reduce((total, print) => {
+        const isMultiplePrint = (print.products || []).length > 0;
+        const printProducts = print.products || [];
+        const isMultiplePrintMainProduct = printProducts.indexOf(this.product.guid) === 0 || printProducts.indexOf(this.product._id) === 0;
         const isFreeSetup = print.freeSetupOver >= 0 && this.amount > print.freeSetupOver;
         const printCost = print.costType === 'setup only' ? 0 : print.printCost;
-        const setupCost = (print.costType === 'item cost only' || isFreeSetup) ? 0 : print.setupCost;
+        const setupCost = (isMultiplePrint && !isMultiplePrintMainProduct) ? 0 : (print.costType === 'item cost only' || isFreeSetup) ? 0 : print.setupCost;
         return total + this.amount * printCost + setupCost;
       }, 0);
       const productsTotal = this.simpleProducts.reduce((total, { amount = 0, productCost = 0 }) => total + amount * productCost, 0);

package/middleware/page-info.js

@@ -1,4 +1,4 @@
-export default async function ({ store, route }) {
+export default async function ({ store, route, redirect }) {
   const matchedRoute = route.matched[route.matched.length - 1];
   if (matchedRoute) {
     const path = matchedRoute.path.replace(/\?/g, '');
@@ -7,6 +7,9 @@ export default async function ({ store, route }) {
       route: path || '/',
       fullPath: route.fullPath
     };
-    await store.dispatch('page/fetchRouteInfo', data);
+    const routeInfo = await store.dispatch('page/fetchRouteInfo', data);
+    if (routeInfo?.type === 'redirect' && routeInfo.redirectTo) {
+      redirect(routeInfo.redirectTo);
+    }
   }
 }

package/package.json

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

package/store/page.js

@@ -12,6 +12,7 @@ export const actions = {
   async fetchRouteInfo({ commit }, { route, shop, fullPath }) {
     const routeInfo = await api.fetchRouteInfo(route, shop, fullPath);
     commit('setRouteInfo', !routeInfo.error ? routeInfo : {});
+    return routeInfo;
   }
 };
 

package/store/quote.js

@@ -45,6 +45,9 @@ export const actions = {
     commit('setQuote', quote);
     commit('setOption', option);
     commit('viewedOptions', null);
+    if (quote.options.length === 1) {
+      commit('setSelectedOption', quote.options[0]);
+    }
   },
   fetchViewedOptions({ commit }, { quote }) {
     const options = getViewedOptions(quote) || [];