@lancom/shared 0.0.173 → 0.0.175

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/prints.js

@@ -62,8 +62,15 @@ export function getPrintsFromLayers(layers, product) {
   return [...prints.values()];
 }
 
-export function getPrintTypeSizePricing(printType, sizeId) {
-  return (printType?.printAreas || [])
+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))
+      }
+    });
+  return couponPrintArea || (printType?.printAreas || [])
     .find(({ printSizes }) => {
       return printSizes.map(size => size?._id || size).includes(sizeId);
     }) || (printType?.printAreas || [])[0];

package/package.json

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

package/store/cart.js

@@ -218,17 +218,21 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon
     entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
       _id,
       guid,
+      name: product.name,
       brand: getSimpleObj(product.brand),
-      simpleProducts: simpleProducts.map(({ _id, guid, amount, pricing, unprintedPricing, weight = 0 }) => ({
-        amount,
-        pricing: (prints || []).length > 0 ? pricing : unprintedPricing,
-        weight: product.weight,
-        volume: product.volume,
-        guid,
-        _id
-      })).filter(({ amount }) => +amount > 0),
+      simpleProducts: simpleProducts.map(({ _id, guid, amount, pricing, unprintedPricing, weight = 0 }) => {
+        const couponProduct = (coupon?.products || []).find(({ products }) => products.includes(product._id));
+        return {
+          amount,
+          pricing: couponProduct?.pricing || ((prints || []).length > 0 ? pricing : unprintedPricing),
+          weight: product.weight,
+          volume: product.volume,
+          guid,
+          _id
+        };
+      }).filter(({ amount }) => +amount > 0),
       prints: (prints || []).map(print => {
-        const { setupCost, freeSetupOver, printCost } = getPrintTypeSizePricing(print.printType, print.printSize?._id) || {};
+        const { setupCost, freeSetupOver, printCost } = getPrintTypeSizePricing(print.printType, print.printSize?._id, coupon) || {};
         return {
           costType: print.printType.costType,
           setupCost,

package/store/index.js

@@ -56,6 +56,13 @@ export const actions = {
       if (state.cart?.id) {
         const cart = await api.fetchCartById(shop._id, state.cart?.id);
         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 });
       }
     }