@lancom/shared 0.0.177 → 0.0.178

package/assets/js/api/admin.js

@@ -85,8 +85,8 @@ export default {
   savePurchaseOrder(purchaseOrder) {
     return purchaseOrder._id ? _put(`admin/purchase-order/${purchaseOrder._id}`, purchaseOrder) : _post('admin/purchase-order', purchaseOrder);
   },
-  savePurchaseOrderShipment(purchaseOrder, shipment) {
-    return _put(`admin/purchase-order/${purchaseOrder._id}/shipments/${shipment._id}`, shipment);
+  savePurchaseOrderShipment(purchaseOrder, shipment, params) {
+    return _put(`admin/purchase-order/${purchaseOrder._id}/shipments/${shipment._id}`, shipment, params);
   },
   fetchPurchaseOrderWoTasks(purchaseOrderId) {
     return _get(`admin/purchase-order/${purchaseOrderId}/wo-tasks`);

package/assets/js/api/helpers.js

@@ -38,6 +38,6 @@ export const prepareHeaders = method => {
 
 export const _post = (url, data, config) => axiosApiInstance.post(buildPath(url), data, { ...config, headers: prepareHeaders() }).then(response => response.data);
 export const _get = (url, params) => axiosApiInstance.get(buildPath(url), { params, headers: prepareHeaders('get') }).then(response => response.data);
-export const _put = (url, data) => axiosApiInstance.put(buildPath(url), { ...data, __v: undefined }, { headers: prepareHeaders() }).then(response => response.data);
+export const _put = (url, data, params) => axiosApiInstance.put(buildPath(url), { ...data, __v: undefined }, { params, headers: prepareHeaders() }).then(response => response.data);
 export const _patch = (url, data) => axiosApiInstance.patch(buildPath(url), { ...data, __v: undefined }, { headers: prepareHeaders() }).then(response => response.data);
 export const _delete = (url, data) => axiosApiInstance.delete(buildPath(url), { data, headers: prepareHeaders() }).then(response => response.data);

package/assets/js/utils/gtm.js

@@ -28,23 +28,25 @@ const gtm = {
     });
   },
   viewCart(entities, pricing) {
-    this.push({
-      event: 'view_cart',
-      value: pricing.totalPriceWithoutTax,
-      currency: 'AUD',
-      coupon: pricing.coupon?.code,
-      items: entities.reduce((products, { guid: productGuid, product, simpleProducts }) => {
-        return [
-          ...products,
-          ...simpleProducts
-            .filter(({ amount }) => amount > 0)
-            .map((sp) => ({
-              ...getOrderItem(product, sp),
-              price: pricing.products[productGuid]?.products[sp.guid]?.priceWithoutTax
-            }))
-        ];
-      }, [])
-    });
+    if (pricing) {
+      this.push({
+        event: 'view_cart',
+        value: pricing.totalPriceWithoutTax,
+        currency: 'AUD',
+        coupon: pricing.coupon?.code,
+        items: entities.reduce((products, { guid: productGuid, product, simpleProducts }) => {
+          return [
+            ...products,
+            ...simpleProducts
+              .filter(({ amount }) => amount > 0)
+              .map((sp) => ({
+                ...getOrderItem(product, sp),
+                price: pricing.products[productGuid]?.products[sp.guid]?.priceWithoutTax
+              }))
+          ];
+        }, [])
+      });
+    }
   },
   removeFromCart(simpleProducts, pricing) {
     const removeSimpleProducts = simpleProducts.filter(({ amount }) => amount > 0);

package/assets/js/utils/prints.js

@@ -64,12 +64,12 @@ export function getPrintsFromLayers(layers, product) {
 
 export function getPrintTypeSizePricing(printType, sizeId, coupon) {
   let couponPrintArea = null;
-  (coupon?.prints || [])
-    .forEach(({ printAreas, printTypes }) => {
-      if (printTypes.includes(printType._id)) {
-        couponPrintArea = couponPrintArea || printAreas.find(({ printSizes }) => printSizes.includes(sizeId))
-      }
-    });
+  // (coupon?.prints || [])
+  //   .forEach(({ printAreas, printTypes }) => {
+  //     if (printTypes.includes(printType._id)) {
+  //       couponPrintArea = couponPrintArea || printAreas.find(({ printSizes }) => printSizes.includes(sizeId))
+  //     }
+  //   });
   return couponPrintArea || (printType?.printAreas || [])
     .find(({ printSizes }) => {
       return printSizes.map(size => size?._id || size).includes(sizeId);

package/components/common/coupon_select/coupon-select.vue

@@ -24,6 +24,10 @@
               filled: code
             }"
             @keydown.enter="validateCoupon" />
+          <span
+            v-if="value"
+            class="CouponSelect__clear"
+            @click="clearCoupon()">remove coupon</span>
         </div>
         <div class="col-5">
           <btn
@@ -44,19 +48,24 @@
         Not valid coupon
       </span>
     </validation-provider>
-    <div v-if="value">
+    <div v-if="value && pricing">
       <div
         v-if="isValidPricing"
         class="lc_h4">
         <span v-if="value.showCouponIsApplied">
           COUPON APPLIED
+          <span v-if="pricing.totalsWithoutCoupon">
+            : {{ pricing.totalsWithoutCoupon.totalPrice - pricing.totalPrice | price }} OFF
+          </span>
         </span>
         <span v-else>
           {{ value.value | price }} OFF
         </span>
-        <span
-          class="CouponSelect__clear"
-          @click="clearCoupon()">remove</span>
+      </div>
+      <div
+        v-else-if="pricing.couponError"
+        class="lc_caption form-help is-danger">
+        {{ pricing.couponError }}
       </div>
       <div
         v-else
@@ -99,7 +108,7 @@ export default {
   computed: {
     ...mapGetters(['shop']),
     isValidPricing() {
-      return !this.value.minOrderValue || this.pricing.coupon;
+      return !this.value?.minOrderValue || this.pricing.coupon;
     },
     model: {
       get() {

package/package.json

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

package/store/cart.js

@@ -9,6 +9,7 @@ export const state = () => ({
   entities: [],
   suburb: null,
   coupon: null,
+  cartPricingCalculating: false,
   cartPricing: null,
   cartPricingError: null
 });
@@ -44,6 +45,7 @@ const getPrintsQuantities = entities => {
 export const getters = {
   entities: ({ entities }) => entities,
   coupon: ({ coupon }) => coupon,
+  cartPricingCalculating: ({ cartPricingCalculating }) => cartPricingCalculating,
   simpleProducts: ({ entities }) => entities.reduce((simpleProducts, entity) => [...simpleProducts, ...(entity.simpleProducts || [])], []),
   notEmptySimpleProducts: (state, { simpleProducts }) => simpleProducts.filter(e => e.amount > 0),
   simpleProductsQuantity: (state, { notEmptySimpleProducts }) => notEmptySimpleProducts.reduce((quantity, sp) => quantity + sp.amount, 0),
@@ -128,6 +130,7 @@ export const actions = {
     const selectedSuppliersWithRates = cartPricing?.shipping?.suppliersWithRates;
     const payload = generateCalculatePriceData(entities, suburb, null, coupon, selectedSuppliersWithRates);
     try {
+      commit('setCartPricingCalculating', true);
       const response = await api.calculateProductPrice(payload, shop._id);
       commit('setCartPricing', response);
       commit('setCartPricingError', null);
@@ -135,6 +138,8 @@ export const actions = {
       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 }) {
@@ -165,6 +170,7 @@ export const actions = {
       }));
     const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon);
     try {
+      commit('setCartPricingCalculating', true);
       const response = await api.calculateProductPrice(payload, shop._id);
       commit('setCartPricing', response);
       commit('setCartPricingError', null);
@@ -172,6 +178,8 @@ export const actions = {
       const { error = 'Error calculate pricing' } = e.response?.data || {};
       commit('setCartPricingError', error);
       commit('setCartPricing', null);
+    } finally {
+      commit('setCartPricingCalculating', false);
     }
   }
 };
@@ -196,6 +204,9 @@ export const mutations = {
   setCartPricing(state, price) {
     state.cartPricing = price;
   },
+  setCartPricingCalculating(state, calculating) {
+    state.cartPricingCalculating = calculating;
+  },
   setCartPricingError(state, error) {
     state.cartPricingError = error;
   },
@@ -218,13 +229,14 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon
     entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
       _id,
       guid,
+      productId: product._id,
       name: product.name,
       brand: getSimpleObj(product.brand),
       simpleProducts: simpleProducts.map(({ _id, guid, amount, pricing, unprintedPricing, weight = 0 }) => {
-        const couponProduct = (coupon?.products || []).find(({ products }) => products.includes(product._id));
+        // const couponProduct = (coupon?.products || []).find(({ products, onlyPrinted }) => products.includes(product._id) && (!onlyPrinted || (prints || []).length > 0));
         return {
           amount,
-          pricing: couponProduct?.pricing || ((prints || []).length > 0 ? pricing : unprintedPricing),
+          pricing: ((prints || []).length > 0 ? pricing : unprintedPricing),
           weight: product.weight,
           volume: product.volume,
           guid,