@darkpos/pricing 1.0.33 → 1.0.35

package/__TEST__/order/order.test.js

@@ -2287,4 +2287,194 @@ describe('Order actions', () => {
       _actual: 10,
     });
   });
+
+  test('CU-86duna31h -> Get calculated Order, multiple items and indirect required discount modifiers', () => {
+    const discountModifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `10% Discount`,
+      type: 'discount',
+      required: true,
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 1,
+      modifiers: [
+        {
+          ...discountModifier,
+          _parentId: discountModifier._id,
+          modifierId: discountModifier._id,
+        },
+      ],
+    };
+    const item2 = {
+      _id: 2,
+      price: 20,
+      quantity: 1,
+      modifiers: [
+        {
+          ...discountModifier,
+          _parentId: discountModifier._id,
+          modifierId: discountModifier._id,
+        },
+      ],
+    };
+
+    const order = { items: [item1, item2], modifiers: [discountModifier] };
+
+    const newOrder = pricingService.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 27);
+    expect(newOrder).toHaveProperty('subTotal', 30);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -3,
+    });
+    expect(newOrder.items[0]).toHaveProperty('total', 9);
+    expect(newOrder.items[0]).toHaveProperty('subTotals', {
+      discount: -1,
+      _included: 0,
+      _xincluded: -1,
+      _direct: 0,
+      _xdirect: -1,
+      _simple: 10,
+      _actual: 10,
+    });
+    expect(newOrder.items[1]).toHaveProperty('total', 18);
+    expect(newOrder.items[1]).toHaveProperty('subTotals', {
+      discount: -2,
+      _included: 0,
+      _xincluded: -2,
+      _direct: 0,
+      _xdirect: -2,
+      _simple: 20,
+      _actual: 20,
+    });
+  });
+
+  test('CU-86duna31h -> Get calculated Order, multiple items and indirect  discount modifiers', () => {
+    const discountModifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `10% Discount`,
+      type: 'discount',
+      required: true,
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 1,
+      modifiers: [],
+    };
+    const item2 = {
+      _id: 2,
+      price: 20,
+      quantity: 1,
+      modifiers: [],
+    };
+
+    const order = { items: [item1, item2], modifiers: [discountModifier] };
+
+    const newOrder = pricingService.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 27);
+    expect(newOrder).toHaveProperty('subTotal', 30);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -3,
+    });
+    expect(newOrder.items[0]).toHaveProperty('total', 9);
+    expect(newOrder.items[0]).toHaveProperty('subTotals', {
+      discount: -1,
+      _included: 0,
+      _xincluded: -1,
+      _direct: 0,
+      _xdirect: -1,
+      _simple: 10,
+      _actual: 10,
+    });
+    expect(newOrder.items[1]).toHaveProperty('total', 18);
+    expect(newOrder.items[1]).toHaveProperty('subTotals', {
+      discount: -2,
+      _included: 0,
+      _xincluded: -2,
+      _direct: 0,
+      _xdirect: -2,
+      _simple: 20,
+      _actual: 20,
+    });
+  });
+
+  test('CU-86duna31h ->  Get calculated Order, multiple items and indirect required discount modifiers', () => {
+    const discountModifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `10% Discount`,
+      type: 'discount',
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 1,
+      modifiers: [
+        {
+          ...discountModifier,
+          _parentId: discountModifier._id,
+          modifierId: discountModifier._id,
+        },
+      ],
+    };
+    const item2 = {
+      _id: 2,
+      price: 20,
+      quantity: 1,
+      modifiers: [
+        {
+          ...discountModifier,
+          _parentId: discountModifier._id,
+          modifierId: discountModifier._id,
+        },
+      ],
+    };
+    const order = { items: [item1, item2], modifiers: [discountModifier] };
+
+    const newOrder = pricingService.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 27);
+    expect(newOrder).toHaveProperty('subTotal', 30);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -3,
+    });
+    expect(newOrder.items[0]).toHaveProperty('total', 9);
+    expect(newOrder.items[0]).toHaveProperty('subTotals', {
+      discount: -1,
+      _included: 0,
+      _xincluded: -1,
+      _direct: 0,
+      _xdirect: -1,
+      _simple: 10,
+      _actual: 10,
+    });
+    expect(newOrder.items[1]).toHaveProperty('total', 18);
+    expect(newOrder.items[1]).toHaveProperty('subTotals', {
+      discount: -2,
+      _included: 0,
+      _xincluded: -2,
+      _direct: 0,
+      _xdirect: -2,
+      _simple: 20,
+      _actual: 20,
+    });
+  });
 });

package/lib/item/removeModifier.js

@@ -5,12 +5,14 @@ module.exports = ({ modifierActions, _, actions }) => {
   const isValid = (itemModifiers, modifier) => {
     if (!modifierActions.findById(itemModifiers, modifier._id)) return false;
 
-    if (
-      modifierActions.isRequired(modifier) &&
-      !modifierActions.isGroupOfValues(modifier) &&
-      !modifierActions.isRequiredAndOverride(modifier)
-    )
-      return false;
+    // 18-SEP-24 - Commenting out due to bug: https://app.clickup.com/t/86duna31h.
+    // This logic was preventing required Order Discounts to be removed from the items.
+    // if (
+    //   modifierActions.isRequired(modifier) &&
+    //   !modifierActions.isGroupOfValues(modifier) &&
+    //   !modifierActions.isRequiredAndOverride(modifier)
+    // )
+    //   return false;
 
     if (
       !modifierActions.isGroupOfItems(modifier) &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -19,7 +19,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@darkpos/utils": "1.0.9",
+    "@darkpos/utils": "1.0.10",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.34"
   },
@@ -36,5 +36,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "fed12242f23f92ff8cad9122afd770e6569f627a"
+  "gitHead": "00a27ca75fa0c5b5a2e0dba0f9446487f7c1ac63"
 }