@lancom/shared 0.0.174 → 0.0.176

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/components/common/coupon_select/coupon-select.scss

@@ -0,0 +1,10 @@
+.CouponSelect {
+  &__clear {
+    font-size: 13px;
+    margin-left: 5px;
+    border-bottom: 1px dashed black;
+    display: inline-block;
+    cursor: pointer;
+    line-height: 14px;
+  }
+}

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

@@ -48,7 +48,15 @@
       <div
         v-if="isValidPricing"
         class="lc_h4">
-        {{ value.value | price }} OFF
+        <span v-if="value.showCouponIsApplied">
+          COUPON APPLIED
+        </span>
+        <span v-else>
+          {{ value.value | price }} OFF
+        </span>
+        <span
+          class="CouponSelect__clear"
+          @click="clearCoupon()">remove</span>
       </div>
       <div
         v-else
@@ -108,6 +116,10 @@ export default {
     }
   },
   methods: {
+    clearCoupon() {
+      this.model = null;
+      this.code = null;
+    },
     async validateCoupon() {
       this.notValidCoupon = false;
       if (this.code) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.174",
+  "version": "0.0.176",
   "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 });
       }
     }