@cloudcommerce/app-discounts 0.14.1 → 0.15.0

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @cloudcommerce/app-discounts@0.14.0 build /home/leo/code/ecomplus/cloud-commerce/packages/apps/discounts
+> @cloudcommerce/app-discounts@0.14.1 build /home/leo/code/ecomplus/cloud-commerce/packages/apps/discounts
 > bash ../../../scripts/build-lib.sh
 

package/lib-mjs/apply-discount.mjs

@@ -344,10 +344,33 @@ export default async ({ params, application }) => {
           if (discountRule.description) {
             response.discount_rule.description = discountRule.description;
           }
+          if (!checkOpenPromotion(discountRule)) {
+            // check for additional open discount
+            const {
+              discountRule: openDiscountRule,
+              discountMatchEnum: openDiscountMatchEnum,
+            } = matchDiscountRule(discountRules, {});
+            if (
+              openDiscountRule
+              && openDiscountRule.cumulative_discount !== false
+              && openDiscountRule.discount.min_amount
+            ) {
+              let checkAmount = params.amount[openDiscountRule.discount.amount_field || 'total'];
+              if (checkAmount) {
+                // subtract current discount to validate cumulative open discount min amount
+                if (response.discount_rule) {
+                  checkAmount -= response.discount_rule.extra_discount.value;
+                }
+                if (openDiscountRule.discount.min_amount <= checkAmount) {
+                  addDiscount(openDiscountRule.discount, openDiscountMatchEnum);
+                }
+              }
+            }
+          }
 
           const { customer } = params;
           if (
-            customer && customer._id
+            customer && (customer._id || customer.doc_number)
             && (discountRule.usage_limit > 0 || discountRule.total_usage_limit > 0)
           ) {
             // list orders to check discount usage limits
@@ -357,7 +380,9 @@ export default async ({ params, application }) => {
               + encodeURIComponent(label);
             const usageLimits = [{
               // limit by customer
-              query: `&buyers._id=${customer._id}`,
+              query: customer.doc_number
+                ? `&buyers.doc_number=${customer.doc_number}`
+                : `&buyers._id=${customer._id}`,
               max: discountRule.usage_limit,
             }, {
               // total limit

package/lib-mjs/helpers.mjs

@@ -65,8 +65,10 @@ const getValidDiscountRules = (discountRules, params, items) => {
           if (rule.discount && rule.discount.value) {
             if (rule.discount.type === 'percentage') {
               value *= rule.discount.value / 100;
+            } else if (rule.discount_kit_subtotal) {
+              value = rule.discount.value;
             } else {
-              value += rule.discount.value;
+              value = Math.min(value, rule.discount.value);
             }
           }
           rule.discount = {
@@ -88,7 +90,7 @@ const getValidDiscountRules = (discountRules, params, items) => {
   return [];
 };
 
-const matchDiscountRule = (discountRules, params) => {
+const matchDiscountRule = (discountRules, params = {}) => {
   // try to match a promotion
   if (params.discount_coupon) {
     // match only by discount coupon

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "lib/discounts.js",
   "repository": {
@@ -16,11 +16,11 @@
   },
   "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/apps/discounts#readme",
   "dependencies": {
-    "@ecomplus/utils": "1.5.0-rc.3",
-    "@cloudcommerce/api": "0.14.1"
+    "@ecomplus/utils": "1.5.0-rc.5",
+    "@cloudcommerce/api": "0.15.0"
   },
   "devDependencies": {
-    "@cloudcommerce/types": "0.14.1"
+    "@cloudcommerce/types": "0.15.0"
   },
   "scripts": {
     "build": "bash ../../../scripts/build-lib.sh"