@lancom/shared 0.0.465 → 0.0.467

package/assets/js/api/admin.js

@@ -128,6 +128,9 @@ export default {
   orderSubOrders(body) {
     return _post('admin/sub-orders/ordered', body);
   },
+  saveSubOrder(subOrder) {
+    return _put(`admin/sub-order/${subOrder._id}`, subOrder);
+  },
   generateOrderPickPDF(orderId) {
     return _post(`admin/order/${orderId}/pick-pdf`);
   },
@@ -152,6 +155,9 @@ export default {
   markShipmentAsDispatched(order, shipment) {
     return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/dispatched`, shipment);
   },
+  markLabelsPrinted(order) {
+    return _post(`admin/order/${order._id}/mark-labels-printed`);
+  },
   markShipmentAsHasException(order, shipment) {
     return _post(`admin/shop/${order.shop?._id || order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/has-exception`, shipment);
   },
@@ -312,7 +318,7 @@ export default {
     return _delete(`admin/inventory-history/${id}`);
   },
   fetchInventory(params) {
-    return _get('admin/inventory');
+    return _get('admin/inventory', params);
   },
   fetchProducts(params) {
     return _get('admin/products', params);

package/assets/js/constants/print-type.js

@@ -2,7 +2,8 @@ export const PRINT_TYPES = {
   BLACK: 'black print',
   FULL_COLOUR: 'full colour print',
   EMBROIDERY: 'embroidery',
-  SCREEN: 'screen print'
+  SCREEN: 'screen print',
+  REFLECTIVE: 'reflective'
 };
 
 export const PRINT_TYPES_LIST = Object.keys(PRINT_TYPES).map(k => PRINT_TYPES[k]);

package/components/checkout/cart/cart.mixin.js

@@ -16,6 +16,7 @@ export default {
     ...mapGetters(['shop', 'country', 'currency']),
     ...mapGetters('auth', ['user']),
     ...mapGetters('cart', [
+      'loadingCart',
       'needToPickup',
       'needToPickupWithoutErrors',
       'entities',
@@ -60,7 +61,10 @@ export default {
     }
   },
   mounted() {
-    this.calculateCartPriceWithDebounce({ shop: this.shop, country: this.country, currency: this.currency });
+    // console.log('this.loadingCart: ', this.loadingCart);
+    // if (!this.loadingCart) {
+    //   this.calculateCartPriceWithDebounce({ shop: this.shop, country: this.country, currency: this.currency });
+    // }
     if (!this.suburb && this.user?.suburb) {
       this.handleSuburbChange(this.user.suburb);
     }

package/components/checkout/cart/cart.vue

@@ -77,7 +77,7 @@
     <div
       v-else
       class="lc_caption lc_text-centered Cart__no-entities">
-      Your cart is empty.
+      {{ loadingCart ? 'Your cart is loading...' : 'Your cart is empty.' }}
     </div>
   </div>
 </template>
@@ -115,7 +115,7 @@ export default {
   },
   computed: {
     ...mapGetters(['MESSAGES', 'SETTINGS', 'currency', 'country']),
-    ...mapGetters('cart', ['isEmpty', 'cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities', 'entitiesWithoutFreeProducts']),
+    ...mapGetters('cart', ['isEmpty', 'cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities', 'entitiesWithoutFreeProducts', 'loadingCart']),
     productsEntities() {
       return this.entitiesWithoutFreeProducts.filter(e => !e.productsKit);
     },

package/components/checkout/order/order.vue

@@ -30,7 +30,7 @@
     <div
       v-else
       class="lc_caption lc_text-centered Cart__no-entities">
-      Your cart is empty.
+      {{ loadingCart ? 'Your cart is loading...' : 'Your cart is empty.' }}
     </div>
   </div>
 </template>
@@ -83,7 +83,7 @@ export default {
   },
   computed: {
     ...mapGetters('country'),
-    ...mapGetters('cart', ['isEmpty']),
+    ...mapGetters('cart', ['isEmpty', 'loadingCart']),
     ...mapGetters('order', ['orderData']),
     ...mapGetters('auth', ['isAuthenticated', 'user']),
     steps() {

package/components/order/order_view/order-view.vue

@@ -181,7 +181,9 @@
             <div class="lc_regular16">
               Total inc {{ taxName }}: <b>{{ model.totalGST | price(order.currency) }}</b>
             </div>
-            <div class="lc_regular16">
+            <div
+              class="lc_regular16"
+              style="background-color: #000; color: #fff; padding: 4px 8px; display: inline-block;">
               {{ isPaid ? 'Paid' : 'Pending Payment' }}: <b>{{ model.totalGST | price(order.currency) }}</b>
             </div>
           </div>
@@ -229,7 +231,9 @@
           <div class="lc_regular16">
             Total inc {{ taxName }}: <b>{{ model.totalGST | price(order.currency) }}</b>
           </div>
-          <div class="lc_regular16">
+          <div
+            class="lc_regular16"
+            style="background-color: #000; color: #fff; padding: 4px 8px; display: inline-block;">
             {{ isPaid ? 'Paid' : 'Pending Payment' }}: <b>{{ model.totalGST | price(order.currency) }}</b>
           </div>
         </div>

package/components/product/wizard/wizard_print/wizard-print.vue

@@ -69,7 +69,7 @@ export default {
   data() {
     return {
       orderPrintTypes: [{
-        types: ['black print', 'full colour print'],
+        types: ['black print', 'full colour print', 'reflective'],
         icon: 'printed',
         name: 'DIGITAL',
         subName: '',

package/components/products/products_link/products-link.vue

@@ -1,10 +1,10 @@
 <template>
-  <a
-    :href="link"
+  <nuxt-link
+    :to="link"
     class="ProductsLink"
     rel="nofollow">
     <slot></slot>
-  </a>
+  </nuxt-link>
 </template>
 
 <script>

package/mixins/product-preview.js

@@ -43,6 +43,10 @@ const productPreview = {
       type: Boolean,
       default: true
     },
+    visibleQuickView: {
+      type: Boolean,
+      default: false
+    },
     linkTarget: {
       type: String,
       default: '_self'

package/package.json

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

package/plugins/save-state.js

@@ -2,7 +2,6 @@ import debounce from 'lodash.debounce';
 
 const STATE_STORAGE_KEY = 'lancom-state-2.3';
 const SAVE_STATE_MODULES = new Map([
-  ['setGoogleClickId', 'googleClickId'],
   ['cart/setId', 'cart.id'],
   ['cart/clearCart', 'cart.id'],
   ['cart/setCoupon', 'cart.coupon'],

package/store/cart.js

@@ -11,6 +11,7 @@ export const state = () => ({
   id: null,
   entities: [],
   needToPickup: false,
+  loadingCart: false,
   suburb: null,
   coupon: null,
   cartPricingCalculating: false,
@@ -103,6 +104,7 @@ export const getters = {
       return freeProducts.length > 0 ? sum + amount : sum;
     }, 0);
   },
+  loadingCart: ({ loadingCart }) => loadingCart,
   coupon: ({ coupon }) => coupon,
   needToPickup: ({ needToPickup }) => needToPickup,
   needToPickupWithoutErrors: (state, { notValidProductsPickup }) => state.needToPickup && notValidProductsPickup?.length === 0,
@@ -229,25 +231,28 @@ export const actions = {
     await api.saveCart(payload, shop._id);
     commit('setCartSaving', false);
   },
-  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing }, getters: { needToPickup }, commit }, { shop, country, currency }) {
-    let savedSuppliersWithRates = null;
-    try {
-      savedSuppliersWithRates = JSON.parse(localStorage.getItem(SUPPLIERS_WITH_RATES_KEY));
-    } catch (e) {}
-    const selectedSuppliersWithRates = cartPricing?.shipping?.suppliersWithRates || savedSuppliersWithRates;
-    const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates, country, currency);
-    console.log('calculateCartPrice:payload: ', payload)
-    try {
-      commit('setCartPricingCalculating', true);
-      const response = await api.calculateProductPrice({ ...payload, needToPickup }, shop._id);
-      commit('setCartPricing', response);
-      commit('setCartPricingError', null);
-    } catch (e) {
-      const { error = 'Error calculate pricing' } = e.response?.data || {};
-      commit('setCartPricingError', error);
-      commit('setCartPricing', null);
-    } finally {
-      commit('setCartPricingCalculating', false);
+  async calculateCartPrice({ state: { suburb, entities, coupon, cartPricing, loadingCart }, getters: { needToPickup }, commit }, { shop, country, currency }) {
+    if (!loadingCart) {
+      console.trace();
+      let savedSuppliersWithRates = null;
+      try {
+        savedSuppliersWithRates = JSON.parse(localStorage.getItem(SUPPLIERS_WITH_RATES_KEY));
+      } catch (e) {}
+      const selectedSuppliersWithRates = cartPricing?.shipping?.suppliersWithRates || savedSuppliersWithRates;
+      const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates, country, currency);
+      console.log('calculateCartPrice:payload: ', payload)
+      try {
+        commit('setCartPricingCalculating', true);
+        const response = await api.calculateProductPrice({ ...payload, needToPickup }, shop._id);
+        commit('setCartPricing', response);
+        commit('setCartPricingError', null);
+      } catch (e) {
+        const { error = 'Error calculate pricing' } = e.response?.data || {};
+        commit('setCartPricingError', error);
+        commit('setCartPricing', null);
+      } finally {
+        commit('setCartPricingCalculating', false);
+      }
     }
   },
   async setSimpleProductAmount({ state, commit }, { guid, amount, shop, currency }) {
@@ -310,6 +315,10 @@ export const actions = {
 };
 
 export const mutations = {
+  setLoadingCart(state, loadingCart) {
+    state.loadingCart = loadingCart;
+    console.log('state.loadingCart: ', state.loadingCart);
+  },
   setCart(state, cart) {
     state.id = cart?._id;
     state.entities = cart?.entities || [];

package/store/index.js

@@ -5,7 +5,18 @@ import { getShopCountrySettings } from '@lancom/shared/assets/js/utils/shop';
 import { MESSAGES, COUNTRIES_MESSAGES } from '@/messages';
 import { SETTINGS, COUNTRIES_SETTINGS } from '@/settings';
 const cookieparser = process.server ? require('cookieparser') : undefined;
+const Cookies = process.browser ? require('js-cookie') : undefined;
 const CLOSED_NOTIFICATION = 'lancom-closed-notification-1.0';
+const GCLID_COOKIE = 'gclid';
+const GCLID_EXPIRE_DAYS = 90;
+
+function getGclidCookie() {
+  return Cookies?.get(GCLID_COOKIE) || null;
+}
+
+function setGclidCookie(value) {
+  Cookies?.set(GCLID_COOKIE, value, { expires: GCLID_EXPIRE_DAYS, path: '/' });
+}
 
 export const state = () => ({
   googleClickId: null,
@@ -108,6 +119,7 @@ export const actions = {
     }
   },
   async loadState({ dispatch, commit, state: { shop, currency, country, notificationBar } }, query) {
+    console.log('loadState...', query);
     const state = await loadState(query);
     if (state) {
       commit('setState', state);
@@ -116,19 +128,31 @@ export const actions = {
           currency: currency?._id,
           country: country?._id
         };
-        const cart = await api.fetchCartById(shop._id, state.cart?.id, params);
-        commit('cart/setCart', cart);
-        if (state.cart?.coupon) {
-          try {
-            const code = state.cart?.coupon.code || state.cart?.coupon;
-            const coupon = await api.fetchCouponByCode(shop._id, code);
-            commit('cart/setCoupon', coupon);
-          } catch (e) {}
+        commit('cart/setLoadingCart', true);
+        try {
+          const cart = await api.fetchCartById(shop._id, state.cart?.id, params);
+          commit('cart/setCart', cart);
+          if (state.cart?.coupon) {
+            try {
+              const code = state.cart?.coupon.code || state.cart?.coupon;
+              const coupon = await api.fetchCouponByCode(shop._id, code);
+              commit('cart/setCoupon', coupon);
+            } catch (e) {}
+          }
+          dispatch('cart/calculateCartPrice', { shop, country });
+        } catch (e) {
+        } finally {
+          commit('cart/setLoadingCart', false);
         }
-        dispatch('cart/calculateCartPrice', { shop, country });
       }
     }
-    commit('setGoogleClickId', query.gclid || state?.googleClickId || null);
+
+    const cookieGclid = getGclidCookie();
+    const googleClickId = query.gclid || cookieGclid || null;
+    commit('setGoogleClickId', googleClickId);
+    if (query.gclid) {
+      setGclidCookie(query.gclid);
+    }
 
     const closedNotification = localStorage.getItem(CLOSED_NOTIFICATION);
     if (notificationBar?.text === closedNotification) {