@lancom/shared 0.0.152 → 0.0.153

package/assets/js/api/helpers.js

@@ -4,6 +4,7 @@ const Cookie = process.client ? require('js-cookie') : undefined;
 const axiosApiInstance = axios.create();
 
 if (process.client) {
+  console.log('error: ');
   axiosApiInstance.interceptors.request.use(
     config => {
       const auth = Cookie.get('auth');
@@ -13,8 +14,18 @@ if (process.client) {
       return config;
     },
     error => {
-      Promise.reject(error);
+      return Promise.reject(error);
     });
+    axiosApiInstance.interceptors.response.use(
+      response => response,
+      error => {
+        if (error.response.status === 401) {
+          Cookie.remove('auth');
+          window.location ='/';
+          return;
+        }
+        return Promise.reject(error);
+      });
 }
 
 const API_URL = process.client ? process.env.API_URL : process.env.LOCAL_API_URL;

package/assets/js/utils/filters.js

@@ -82,6 +82,8 @@ export const date = d => dayjs(d).format('ddd, MMM D, YYYY h:mm A');
 
 export const shortDate = d => dayjs(d).format('DD/MM/YYYY');
 
+export const shortUtcDate = d => dayjs(d).utc().format('DD/MM');
+
 export const sydneyTime = d => dayjs(d).utc().utcOffset(10).format('MMM D, YYYY h:mm A');
 
 export const priceInRange = (prices, amount) => ((prices || []).find(({ min, max }) => min <= amount && (!max || max >= amount)) || { price: 0 }).price;

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

@@ -3,8 +3,7 @@
     <div class="ProductPrintsPriceInfo__toggle-gst">
       <checkbox
         v-model="inclGST"
-        :dark="true"
-        @change="onChangeInclGST">
+        :dark="true">
         <div class="ml-5">Inc. GST</div>
       </checkbox>
     </div>
@@ -46,7 +45,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex';
+import { mapActions, mapGetters, mapMutations } from 'vuex';
 import Tabs from '@lancom/shared/components/common/tabs';
 import { price } from '@lancom/shared/assets/js/utils/filters';
 import { PRINT_TYPES, PRINT_TYPES_LIST } from '@lancom/shared/assets/js/constants/print-type';
@@ -68,8 +67,7 @@ export default {
   },
   data() {
     return {
-      inclGST: false,
-      inclGSTFinal: false,
+      inclGSTFinal: true,
       inclGSTSpinner: false,
       inclGSTSpinnerTimer: null,
       orderPrintTypes: PRINT_TYPES_LIST,
@@ -91,6 +89,7 @@ export default {
   },
   computed: {
     ...mapGetters(['shop']),
+    ...mapGetters('product', ['priceIncludeGST']),
     ...mapGetters(['helpMessages']),
     hasPrintSurcharge() {
       return this.product.printSurcharge > 0;
@@ -111,6 +110,19 @@ export default {
     currentPrintTypeMessage() {
       const { message } = this.helpMessages[this.selectedTab] || {};
       return message || '';
+    },
+    inclGST: {
+      get() {
+        return this.priceIncludeGST;
+      },
+      set(value) {
+        this.setPriceIncludeGST(value);
+      }
+    }
+  },
+  watch: {
+    inclGST() {
+      this.onChangeInclGST();
     }
   },
   mounted() {
@@ -125,6 +137,7 @@ export default {
   },
   methods: {
     ...mapActions(['loadHelpMessages']),
+    ...mapMutations('product', ['setPriceIncludeGST']),
     onChangeInclGST() {
       clearTimeout(this.inclGSTSpinnerTimer);
       this.inclGSTSpinner = true;

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

@@ -29,11 +29,11 @@
       }
     }
     &-all {
+      border-top: 1px solid $gray_main;
       padding: 10px;
       text-align: center;
       display: block;
       background-color: $white;
-      border-bottom: 1px solid $gray_main;
       &:hover {
         background-color: $black;
         color: $white;

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

@@ -27,13 +27,6 @@
         <spinner v-if="searching" />
       </div>
       <div v-if="hasProducts">
-        <products-autocomplete-item
-          v-for="product of products"
-          :key="product._id"
-          :to-editor="false"
-          :product="product"
-          class="ProductsAutocomplete__result-item"
-          @select="$emit('select', product)" />
         <div class="ProductsAutocomplete__result-item">
           <nuxt-link
             class="ProductsAutocomplete__result-item-all"
@@ -41,6 +34,13 @@
             click to see all results
           </nuxt-link>
         </div>
+        <products-autocomplete-item
+          v-for="product of products"
+          :key="product._id"
+          :to-editor="false"
+          :product="product"
+          class="ProductsAutocomplete__result-item"
+          @select="$emit('select', product)" />
       </div>
     </div>
   </div>

package/package.json

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

package/store/product.js

@@ -9,6 +9,7 @@ import { getProductsForCalculatePricing } from '@lancom/shared/assets/js/utils/p
 import { sortByName } from '../assets/js/utils/filters';
 
 export const state = () => ({
+  priceIncludeGST: true,
   product: null,
   preSetPrint: null,
   loadError: null,
@@ -124,6 +125,7 @@ export const getters = {
     return [...imagesGroups.values()].reduce((images, group) => [...images, ...group], []);
   },
   editableSide: ({ editableSide }) => editableSide,
+  priceIncludeGST: ({ priceIncludeGST }) => priceIncludeGST,
   hasUnprintedPrice: ({ product }) => product.minUnprintedPrice || product.maxUnprintedPrice
 };
 
@@ -226,6 +228,9 @@ export const mutations = {
   setProduct(state, product) {
     state.product = product;
   },
+  setPriceIncludeGST(state, priceIncludeGST) {
+    state.priceIncludeGST = priceIncludeGST;
+  },
   setLoadError(state, error) {
     state.loadError = error;
   },