@darkpos/pricing 1.0.111 → 1.0.112

package/__TEST__/order/conditionsNotMet.test.js

@@ -1626,12 +1626,48 @@ describe('Conditions not met for the item', () => {
   });
 
   test('Total number of items conditions is  met, using between', () => {
-    const item1 = { pieces: 1, itemId: '1', price: 100, modifiers: [] };
-    const item2 = { pieces: 1, itemId: '2', price: 100, modifiers: [] };
-    const item3 = { pieces: 1, itemId: '3', price: 100, modifiers: [] };
-    const item4 = { pieces: 1, itemId: '4', price: 100, modifiers: [] };
-    const item5 = { pieces: 1, itemId: '5', price: 100, modifiers: [] };
-    const item6 = { pieces: 1, itemId: '6', price: 100, modifiers: [] };
+    const item1 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item2 = {
+      pieces: 1,
+      itemId: '2',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item3 = {
+      pieces: 1,
+      itemId: '3',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item4 = {
+      pieces: 1,
+      itemId: '4',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item5 = {
+      pieces: 1,
+      itemId: '5',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item6 = {
+      pieces: 1,
+      itemId: '6',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
 
     const order = {
       id: 'ord-123',
@@ -1667,10 +1703,34 @@ describe('Conditions not met for the item', () => {
   });
 
   test('Total number of items conditions is  not met, using between', () => {
-    const item1 = { pieces: 1, itemId: '1', price: 100, modifiers: [] };
-    const item2 = { pieces: 1, itemId: '2', price: 100, modifiers: [] };
-    const item3 = { pieces: 1, itemId: '3', price: 100, modifiers: [] };
-    const item4 = { pieces: 1, itemId: '4', price: 100, modifiers: [] };
+    const item1 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item2 = {
+      pieces: 1,
+      itemId: '2',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item3 = {
+      pieces: 1,
+      itemId: '3',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item4 = {
+      pieces: 1,
+      itemId: '4',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
 
     const order = {
       id: 'ord-123',
@@ -1706,10 +1766,34 @@ describe('Conditions not met for the item', () => {
   });
 
   test('Total number of items conditions is met, using gt', () => {
-    const item1 = { pieces: 1, itemId: '1', price: 100, modifiers: [] };
-    const item2 = { pieces: 1, itemId: '2', price: 100, modifiers: [] };
-    const item3 = { pieces: 1, itemId: '3', price: 100, modifiers: [] };
-    const item4 = { pieces: 1, itemId: '4', price: 100, modifiers: [] };
+    const item1 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item2 = {
+      pieces: 1,
+      itemId: '2',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item3 = {
+      pieces: 1,
+      itemId: '3',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item4 = {
+      pieces: 1,
+      itemId: '4',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
 
     const order = {
       id: 'ord-123',
@@ -1742,10 +1826,34 @@ describe('Conditions not met for the item', () => {
   });
 
   test('Total number of items conditions is not met, using gt', () => {
-    const item1 = { pieces: 1, itemId: '1', price: 100, modifiers: [] };
-    const item2 = { pieces: 1, itemId: '2', price: 100, modifiers: [] };
-    const item3 = { pieces: 1, itemId: '3', price: 100, modifiers: [] };
-    const item4 = { pieces: 1, itemId: '4', price: 100, modifiers: [] };
+    const item1 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item2 = {
+      pieces: 1,
+      itemId: '2',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item3 = {
+      pieces: 1,
+      itemId: '3',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item4 = {
+      pieces: 1,
+      itemId: '4',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
 
     const order = {
       id: 'ord-123',
@@ -1776,4 +1884,54 @@ describe('Conditions not met for the item', () => {
       false
     );
   });
+
+  test('Total number of items conditions is met with 2 items with each one having qty 3, using between', () => {
+    const item1 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 3,
+    };
+
+    const item2 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 3,
+    };
+
+    const order = {
+      id: 'ord-123',
+      items: [item1, item2],
+      modifiers: [],
+    };
+    const modifier = {
+      conditions: {
+        rules: [
+          {
+            key: 'totalNumberOfItems',
+            value: {
+              from: 5,
+              to: 10,
+            },
+            operand: '$between',
+          },
+        ],
+      },
+    };
+    const { addItemModifier } = pricingService.order;
+    const calculatedOrder = pricingService.order.calculate(
+      addItemModifier({
+        order,
+        modifier,
+        itemIndex: 0,
+      })
+    );
+    expect(calculatedOrder.items[0].modifiers.length).toEqual(1);
+    expect(calculatedOrder.items[0].modifiers[0].conditions.valid).toEqual(
+      true
+    );
+  });
 });

package/lib/modifier/areConditionsMet.js

@@ -10,6 +10,14 @@ module.exports = ({ actions, utils }) => {
     return customer.stats[key];
   };
 
+  const getTotalItemsQuantity = ({ items }) => {
+    if (!items || !Array.isArray(items)) return 0;
+    return items.reduce(
+      (total, item) => utils.math.add(total, item.quantity || 0),
+      0
+    );
+  };
+
   const modifierConditionPass = (
     modifier,
     {
@@ -28,7 +36,7 @@ module.exports = ({ actions, utils }) => {
           switch (condition.key) {
             case 'totalNumberOfItems':
               return actions.validateNumberCondition({
-                value: Array.isArray(allItems) ? allItems.length : 0,
+                value: getTotalItemsQuantity({ items: allItems }),
                 condition,
               });
             case 'itemSet': {
@@ -57,10 +65,8 @@ module.exports = ({ actions, utils }) => {
                   }
                 });
 
-              let totalItemsLength = 0;
-
-              matchingItems.forEach(matchItem => {
-                totalItemsLength += matchItem.quantity || 0;
+              const totalItemsLength = getTotalItemsQuantity({
+                items: matchingItems,
               });
 
               const itemIndex = matchingItems.findIndex(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.111",
+  "version": "1.0.112",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -55,5 +55,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "b12a6c9aef83deec91c4ebe365bd9d604a0eecdd"
+  "gitHead": "ecde0ddb5fed6841e2ff1fa688120201557971cb"
 }