@darkpos/pricing 1.0.101 → 1.0.103

package/__TEST__/item.test.js

@@ -1316,4 +1316,245 @@ describe('Item actions', () => {
     expect(newItem.modifiers.length).toBe(1);
     expect(newItem.modifiers[0].name).toBe('General Repair Department');
   });
+
+  test('1- Item total should not be below 0, having price override modifiers', () => {
+    const order = {
+      _id: '685c2d2bd7f68fccd07af8c7',
+      tax: 0,
+      modifiers: [],
+      discount: 0,
+      total: -2.28,
+      fee: 0,
+      items: [
+        {
+          name: 'Pants',
+          description: null,
+          pieces: 1,
+          modifiersTotalAmount: 0,
+          total: -2.28,
+          totalPaid: 0,
+          price: 0,
+          quantity: 1,
+          notes: [],
+          modifiers: [
+            {
+              _id: '685c2d64d7f68fccd07af8cd',
+              attributes: ['override'],
+              modifierId: '67fea241af24e570c032b40d',
+              _parentId: null,
+              locked: false,
+              name: 'No Clean',
+              tags: ['default'],
+              order: 0,
+              included: false,
+              direct: true,
+              default: true,
+              code: null,
+              properties: {
+                override: {
+                  field: 'price',
+                  type: 'fixed',
+                  multiplier: true,
+                  fixedValue: 0,
+                },
+                group: null,
+                department: null,
+                url: null,
+                color: null,
+                label: {
+                  backgroundColor: null,
+                  align: null,
+                },
+                sort: null,
+              },
+              compute: null,
+              __typename: 'Modifier',
+              addModifiers: [],
+              delModifiers: [],
+            },
+            {
+              _id: '685c2d65d7f68fccd07af8ce',
+              attributes: [],
+              modifierId: '67fea241af24e570c032b324',
+              _parentId: null,
+              locked: false,
+              name: '30% Family Discount',
+              type: 'discount',
+              tags: ['default'],
+              order: 0,
+              included: false,
+              direct: true,
+              hidden: false,
+              print: true,
+              required: false,
+              recommended: false,
+              default: false,
+              code: null,
+              properties: {
+                group: null,
+                department: null,
+                url: null,
+                color: null,
+                label: {
+                  backgroundColor: null,
+                  align: null,
+                },
+                sort: null,
+                isQuantityMultiplier: true,
+              },
+              compute: {
+                type: 'percentage',
+                action: 'subtract',
+                amount: 30,
+              },
+              __typename: 'Modifier',
+              addModifiers: [],
+              delModifiers: [],
+            },
+          ],
+          weight: 0,
+          properties: {
+            overwrittenPrice: 7.59,
+          },
+        },
+      ],
+      customer: {
+        _id: '67feae8eeb5aa1e1848374b9',
+        tags: ['default'],
+      },
+    };
+
+    const calculatedOrder = pricingService.order.calculate(order);
+
+    expect(calculatedOrder.total).toBe(0);
+    expect(calculatedOrder.items[0].price).toBe(0);
+    expect(calculatedOrder.items[0].total).toBe(0);
+    expect(calculatedOrder.items[0].modifiers[0]._computed.description).toBe(
+      'No Clean (0 Unit @ $0.00/Unit)'
+    );
+    expect(calculatedOrder.items[0].modifiers[1]._computed.description).toBe(
+      '30% Family Discount'
+    );
+  });
+
+  test('2- Item total should not be below 0, having price override modifiers', () => {
+    const order = {
+      _id: '685c2d2bd7f68fccd07af8c7',
+      tax: 0,
+      modifiers: [],
+      discount: 0,
+      total: -2.28,
+      fee: 0,
+      items: [
+        {
+          name: 'Pants',
+          description: null,
+          pieces: 1,
+          modifiersTotalAmount: 0,
+          total: -2.28,
+          totalPaid: 0,
+          price: 0,
+          quantity: 1,
+          notes: [],
+          modifiers: [
+            {
+              _id: '685c2d65d7f68fccd07af8ce',
+              attributes: [],
+              modifierId: '67fea241af24e570c032b324',
+              _parentId: null,
+              locked: false,
+              name: '30% Family Discount',
+              type: 'discount',
+              tags: ['default'],
+              order: 0,
+              included: false,
+              direct: true,
+              hidden: false,
+              print: true,
+              required: false,
+              recommended: false,
+              default: false,
+              code: null,
+              properties: {
+                group: null,
+                department: null,
+                url: null,
+                color: null,
+                label: {
+                  backgroundColor: null,
+                  align: null,
+                },
+                sort: null,
+                isQuantityMultiplier: true,
+              },
+              compute: {
+                type: 'percentage',
+                action: 'subtract',
+                amount: 30,
+              },
+              __typename: 'Modifier',
+              addModifiers: [],
+              delModifiers: [],
+            },
+            {
+              _id: '685c2d64d7f68fccd07af8cd',
+              attributes: ['override'],
+              modifierId: '67fea241af24e570c032b40d',
+              _parentId: null,
+              locked: false,
+              name: 'No Clean',
+              tags: ['default'],
+              order: 0,
+              included: false,
+              direct: true,
+              default: true,
+              code: null,
+              properties: {
+                override: {
+                  field: 'price',
+                  type: 'fixed',
+                  multiplier: true,
+                  fixedValue: 0,
+                },
+                group: null,
+                department: null,
+                url: null,
+                color: null,
+                label: {
+                  backgroundColor: null,
+                  align: null,
+                },
+                sort: null,
+              },
+              compute: null,
+              __typename: 'Modifier',
+              addModifiers: [],
+              delModifiers: [],
+            },
+          ],
+          weight: 0,
+          properties: {
+            overwrittenPrice: 7.59,
+          },
+        },
+      ],
+      customer: {
+        _id: '67feae8eeb5aa1e1848374b9',
+        tags: ['default'],
+      },
+    };
+
+    const calculatedOrder = pricingService.order.calculate(order);
+
+    expect(calculatedOrder.total).toBe(0);
+    expect(calculatedOrder.items[0].price).toBe(0);
+    expect(calculatedOrder.items[0].total).toBe(0);
+
+    expect(calculatedOrder.items[0].modifiers[0]._computed.description).toBe(
+      '30% Family Discount'
+    );
+    expect(calculatedOrder.items[0].modifiers[1]._computed.description).toBe(
+      'No Clean (0 Unit @ $0.00/Unit)'
+    );
+  });
 });

package/__TEST__/modifier.test.js

@@ -676,7 +676,7 @@ describe('Modifier actions', () => {
             properties: {
               isManual: true,
             },
-            _id: 'ead6eb247a93bca8f802f9b2',
+            _id: '5d97805a91c31603f8fc6ab0',
           }),
           expect.objectContaining({
             name: 'Blue Label',
@@ -685,7 +685,7 @@ describe('Modifier actions', () => {
             properties: {
               isManual: true,
             },
-            _id: '4e23edf8fa734884f4618003',
+            _id: '49327d26c324cb709456a279',
           }),
         ])
       );
@@ -739,21 +739,21 @@ describe('Modifier actions', () => {
       expect(result).toStrictEqual([
         {
           name: 'Red Tag',
-          _id: 'ead6eb247a93bca8f802f9b2',
+          _id: '5d97805a91c31603f8fc6ab0',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'White Shirt',
-          _id: '4e23edf8fa734884f4618003',
+          _id: '3b115e8ff1d00d9ae4ea3601',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'Blue Label',
-          _id: '94b02ee7ba009b09a913a786',
+          _id: '49327d26c324cb709456a279',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
@@ -815,21 +815,21 @@ describe('Modifier actions', () => {
       expect(result).toStrictEqual([
         {
           name: 'Red Tag',
-          _id: 'ead6eb247a93bca8f802f9b2',
+          _id: '5d97805a91c31603f8fc6ab0',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'White Shirt',
-          _id: '4e23edf8fa734884f4618003',
+          _id: '3b115e8ff1d00d9ae4ea3601',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'Blue Label',
-          _id: '94b02ee7ba009b09a913a786',
+          _id: '49327d26c324cb709456a279',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },

package/__TEST__/order/order.test.js

@@ -2847,7 +2847,7 @@ describe('Order actions', () => {
     });
 
     expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
-      amount: -0,
+      amount: 0,
       description: '100% discount',
     });
   });
@@ -2890,7 +2890,7 @@ describe('Order actions', () => {
     });
 
     expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
-      amount: -0,
+      amount: 0,
       description: '100 USD discount',
     });
   });
@@ -2939,7 +2939,7 @@ describe('Order actions', () => {
     });
 
     expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
-      amount: -0,
+      amount: 0,
       description: '100% discount',
     });
   });
@@ -3001,7 +3001,7 @@ describe('Order actions', () => {
     });
 
     expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
-      amount: -0,
+      amount: 0,
       description: '100 USD discount',
     });
   });
@@ -3108,7 +3108,7 @@ describe('Order actions', () => {
     });
 
     expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
-      amount: -0,
+      amount: 0,
       description: '12 USD discount',
     });
   });

package/lib/item/adjustNegativeTotal.js

@@ -0,0 +1,44 @@
+module.exports = ({ utils, actions, modifierActions }) => {
+  const { math } = utils;
+
+  return function adjustNegativeTotal({ modifiers, subTotals, total, price }) {
+    let excess = math.abs(total);
+
+    for (let i = modifiers.length - 1; i >= 0 && excess > 0; i -= 1) {
+      const mod = modifiers[i];
+
+      if (
+        mod.compute &&
+        mod.compute.action === 'subtract' &&
+        typeof mod._computed.amount === 'number' &&
+        math.lt(mod._computed.amount, 0)
+      ) {
+        const currentAmount = math.abs(mod._computed.amount);
+        const reduction = math.min(currentAmount, excess);
+
+        mod._computed.amount += reduction;
+        mod._computed.description = modifierActions.createDescription({
+          modifier: mod,
+          price,
+        });
+
+        excess = math.sub(excess, reduction);
+
+        const result = actions.getTotals({
+          subTotals,
+          amountToAdd: reduction,
+          included: mod.included,
+          type: mod.type,
+          direct: mod.direct,
+        });
+
+        return {
+          subTotals: result.subTotals,
+          total: result.total,
+        };
+      }
+    }
+
+    return { subTotals, total };
+  };
+};

package/lib/item/applyNotesOverridesToItem.js

@@ -0,0 +1,15 @@
+module.exports = ({ actions, modifierActions }) =>
+  function applyNoteOverridesToItem({ item, validatedModifiers }) {
+    const localItem = item;
+    validatedModifiers.forEach(mod => {
+      if (
+        modifierActions.isNotesOverride(mod) &&
+        modifierActions.isValid(mod)
+      ) {
+        localItem.notes = actions.overrideNotes({
+          item,
+          message: modifierActions.getOverrideNote(mod),
+        }).notes;
+      }
+    });
+  };

package/lib/item/calculate.js

@@ -90,38 +90,18 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
         );
       });
 
-    const modifiersToNotCompute = validatedModifiers
-      .filter(
-        each =>
-          modifierActions.isPaymentModifier(each) ||
-          !modifiersToCompute.find(
-            ceach => ceach.modifierId === each.modifierId
-          ) ||
-          modifierActions.isNotesOverride(each)
-      )
-      .map(each =>
-        modifierActions.calculate(each, {
-          price,
-          quantity,
-          skip: true,
-          basePrice: actions.getBasePrice(item),
-        })
-      );
+    const modifiersToNotCompute = actions.getModifiersToNotCompute({
+      item,
+      validatedModifiers,
+      price,
+      quantity,
+      modifiersToCompute,
+    });
 
     let computedPrice = price;
     let total = math.mul(computedPrice, quantity);
 
-    validatedModifiers.forEach(mod => {
-      if (
-        modifierActions.isNotesOverride(mod) &&
-        modifierActions.isValid(mod)
-      ) {
-        item.notes = actions.overrideNotes({
-          item,
-          message: modifierActions.getOverrideNote(mod),
-        }).notes;
-      }
-    });
+    actions.applyNotesOverridesToItem({ item, validatedModifiers });
 
     if (modifiersToCompute.length || paymentModifiersToCompute.length) {
       // sort modifiers based on sort
@@ -217,16 +197,29 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
         accumulatedAmount = math.add(accumulatedAmount, _computed.amount);
         prvSort = sort;
 
+        let nextSubTotals = {};
+
+        ({ subTotals: nextSubTotals, total } = actions.getTotals({
+          subTotals,
+          amountToAdd: computedAmount,
+          included,
+          type,
+          direct,
+        }));
+
         if (
           !modifierActions.isOverride(modifier) ||
           modifierActions.isOverrideSubtotal(modifier)
         ) {
-          ({ subTotals, total } = actions.getTotals({
+          subTotals = nextSubTotals;
+        }
+
+        if (math.lt(total, 0)) {
+          ({ subTotals, total } = actions.adjustNegativeTotal({
+            modifiers,
             subTotals,
-            amountToAdd: computedAmount,
-            included,
-            type,
-            direct,
+            total,
+            price,
           }));
         }
       }

package/lib/item/getModifiersToNotCompute.js

@@ -0,0 +1,26 @@
+module.exports = ({ actions, modifierActions }) =>
+  function getModifiersToNotCompute({
+    item,
+    validatedModifiers,
+    price,
+    quantity,
+    modifiersToCompute,
+  }) {
+    return validatedModifiers
+      .filter(
+        each =>
+          modifierActions.isPaymentModifier(each) ||
+          !modifiersToCompute.find(
+            ceach => ceach.modifierId === each.modifierId
+          ) ||
+          modifierActions.isNotesOverride(each)
+      )
+      .map(each =>
+        modifierActions.calculate(each, {
+          price,
+          quantity,
+          skip: true,
+          basePrice: actions.getBasePrice(item),
+        })
+      );
+  };

package/lib/item/index.js

@@ -66,6 +66,9 @@ const isOverwrittenPrice = require('./isOverwrittenPrice');
 const isOverwrittenQuantity = require('./isOverwrittenQuantity');
 const overrideNotes = require('./overrideNotes');
 const validateModifiers = require('./validateModifiers');
+const adjustNegativeTotal = require('./adjustNegativeTotal');
+const applyNotesOverridesToItem = require('./applyNotesOverridesToItem');
+const getModifiersToNotCompute = require('./getModifiersToNotCompute');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -145,6 +148,9 @@ const itemActions = (deps = {}) => {
     isOverwrittenQuantity: isOverwrittenQuantity(innerDeps),
     overrideNotes: overrideNotes(innerDeps),
     validateModifiers: validateModifiers(innerDeps),
+    adjustNegativeTotal: adjustNegativeTotal(innerDeps),
+    applyNotesOverridesToItem: applyNotesOverridesToItem(innerDeps),
+    getModifiersToNotCompute: getModifiersToNotCompute(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/calculate.js

@@ -70,15 +70,6 @@ module.exports = ({ _, constants, utils, actions }) => {
         _computed.amount = math.mul(_computed.amount, options.quantity);
       }
 
-      if (
-        actions.isSubtract(_modifier) &&
-        typeof _computed.amount === 'number' &&
-        typeof options.maxDiscountAmount === 'number' &&
-        math.gt(math.abs(_computed.amount), options.maxDiscountAmount)
-      ) {
-        _computed.amount = math.mul(options.maxDiscountAmount, -1);
-      }
-
       if (actions.isTotalOverride(_modifier)) {
         _computed.amount = math.sub(compute.amount, options.maxDiscountAmount);
       }

package/lib/modifier/createManualModifier.js

@@ -0,0 +1,48 @@
+module.exports = ({ sha256 }) => {
+  function combineHashParts(partA, partB) {
+    let combined = '';
+    try {
+      combined = partA
+        .split('')
+        .map((char, index) => {
+          const digitA = parseInt(char, 16);
+          const digitB = parseInt(partB[index], 16);
+
+          // eslint-disable-next-line no-bitwise
+          return (digitA ^ digitB).toString(16);
+        })
+        .join('')
+        .padStart(partA.length, '0');
+    } catch (err) {
+      console.log(JSON.stringify(err));
+    }
+
+    return combined;
+  }
+
+  function generateManualModifierId(parentId, name) {
+    const input = `${parentId}-${name}`;
+    const hash = sha256(input).toString(); // 64 hex characters
+
+    const firstPart = hash.slice(0, 24);
+    const lastPart = hash.slice(-24);
+
+    return combineHashParts(firstPart, lastPart); // 24-char hex string
+  }
+
+  return function createManualModifier({ parentId, name, group }) {
+    const _id = generateManualModifierId(parentId, name);
+
+    const manualModifier = {
+      name,
+      _id,
+      direct: true,
+      group,
+      properties: {
+        isManual: true,
+      },
+    };
+
+    return manualModifier;
+  };
+};

package/lib/modifier/getManualModifiers.js

@@ -1,4 +1,4 @@
-module.exports = ({ sha256 }) => {
+module.exports = ({ actions }) => {
   const csvToArray = input =>
     input
       .split(',')
@@ -39,23 +39,13 @@ module.exports = ({ sha256 }) => {
       ).filter(modName => otherModifiers.every(mod => mod.name !== modName));
 
       modifiers.push(
-        ...manualModifiersNames.map((each, index) => {
-          const hash = sha256(`${index}-${modifier._id}`).toString();
-
-          const _id = hash.substring(0, 24);
-
-          const manualModifier = {
+        ...manualModifiersNames.map(each =>
+          actions.createManualModifier({
+            parentId: modifier._id,
             name: each,
-            _id,
-            direct: true,
             group: modifier.group,
-            properties: {
-              isManual: true,
-            },
-          };
-
-          return manualModifier;
-        })
+          })
+        )
       );
     }
 

package/lib/modifier/index.js

@@ -166,6 +166,7 @@ const getOverrideNote = require('./getOverrideNote');
 const isNotesOverride = require('./isNotesOverride');
 const isOverrideSubtotal = require('./isOverrideSubtotal');
 const validatePaymentCondition = require('./validatePaymentCondition');
+const createManualModifier = require('./createManualModifier');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -345,6 +346,7 @@ const modifierActions = (deps = {}) => {
     isNotesOverride: isNotesOverride(innerDeps),
     isOverrideSubtotal: isOverrideSubtotal(innerDeps),
     validatePaymentCondition: validatePaymentCondition(innerDeps),
+    createManualModifier: createManualModifier(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.101",
+  "version": "1.0.103",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -54,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "aad940d770d15b6072fd45e300302002bfc8fc08"
+  "gitHead": "032bea629a5c32d78886daca4d2382b847b5d075"
 }