@darkpos/pricing 1.0.23 → 1.0.24

package/__TEST__/order/order.test.js

@@ -126,21 +126,21 @@ describe('Order actions', () => {
     });
     expect(newOrder.items[0]).toHaveProperty('total', 58.29);
     expect(newOrder.items[0]).toHaveProperty('subTotals', {
-      discount: -1.71,
+      discount: -1.7142857142857142,
       _included: 0,
-      _xincluded: -1.71,
+      _xincluded: -1.7142857142857142,
       _direct: 0,
-      _xdirect: -1.71,
+      _xdirect: -1.7142857142857142,
       _simple: 60,
       _actual: 60,
     });
     expect(newOrder.items[1]).toHaveProperty('total', 9.71);
     expect(newOrder.items[1]).toHaveProperty('subTotals', {
-      discount: -0.29,
+      discount: -0.2857142857142857,
       _included: 0,
-      _xincluded: -0.29,
+      _xincluded: -0.2857142857142857,
       _direct: 0,
-      _xdirect: -0.29,
+      _xdirect: -0.2857142857142857,
       _simple: 10,
       _actual: 10,
     });
@@ -168,28 +168,28 @@ describe('Order actions', () => {
 
     const order = { items: [item1, item2], modifiers: [modifier1] };
     const newOrder = pricingService.order.calculate(order);
-    expect(newOrder).toHaveProperty('total', 18.57);
+    expect(newOrder).toHaveProperty('total', 18.58);
     expect(newOrder).toHaveProperty('subTotal', 20.64);
     expect(newOrder).toHaveProperty('subTotals', {
-      discount: -2.07,
+      discount: -2.06,
     });
     expect(newOrder.items[0]).toHaveProperty('total', 14.39);
     expect(newOrder.items[0]).toHaveProperty('subTotals', {
-      discount: -1.6,
+      discount: -1.599,
       _included: 0,
-      _xincluded: -1.6,
+      _xincluded: -1.599,
       _direct: 0,
-      _xdirect: -1.6,
+      _xdirect: -1.599,
       _simple: 15.99,
       _actual: 15.99,
     });
-    expect(newOrder.items[1]).toHaveProperty('total', 4.18);
+    expect(newOrder.items[1]).toHaveProperty('total', 4.19);
     expect(newOrder.items[1]).toHaveProperty('subTotals', {
-      discount: -0.47,
+      discount: -0.465,
       _included: 0,
-      _xincluded: -0.47,
+      _xincluded: -0.465,
       _direct: 0,
-      _xdirect: -0.47,
+      _xdirect: -0.465,
       _simple: 4.65,
       _actual: 4.65,
     });
@@ -683,33 +683,33 @@ describe('Order actions', () => {
       tax: 7.21,
     });
     expect(newOrder.items[0]).toHaveProperty('total', 80.6);
-    expect(newOrder.items[1]).toHaveProperty('total', 13.7);
-    expect(newOrder.items[2]).toHaveProperty('total', 5.9);
+    expect(newOrder.items[1]).toHaveProperty('total', 13.69);
+    expect(newOrder.items[2]).toHaveProperty('total', 5.91);
     expect(newOrder.items[0].modifiers[0].compute).toHaveProperty(
       'amount',
       13.2
     );
     expect(newOrder.items[0].modifiers[1].compute).toHaveProperty(
       'amount',
-      5.8
+      5.797
     );
 
     expect(newOrder.items[1].modifiers[0].compute).toHaveProperty(
       'amount',
-      2.24
+      2.2425
     );
     expect(newOrder.items[1].modifiers[1].compute).toHaveProperty(
       'amount',
-      0.99
+      0.985025
     );
 
     expect(newOrder.items[2].modifiers[0].compute).toHaveProperty(
       'amount',
-      0.97
+      0.9675
     );
     expect(newOrder.items[2].modifiers[1].compute).toHaveProperty(
       'amount',
-      0.42
+      0.4247
     );
   });
 
@@ -775,8 +775,8 @@ describe('Order actions', () => {
       tax: 7.21,
     });
     expect(newOrder.items[0]).toHaveProperty('total', 80.6);
-    expect(newOrder.items[1]).toHaveProperty('total', 13.7);
-    expect(newOrder.items[2]).toHaveProperty('total', 5.9);
+    expect(newOrder.items[1]).toHaveProperty('total', 13.69);
+    expect(newOrder.items[2]).toHaveProperty('total', 5.91);
     expect(newOrder.items[0].modifiers[0].compute).toHaveProperty(
       'amount',
       13.2
@@ -788,20 +788,20 @@ describe('Order actions', () => {
 
     expect(newOrder.items[1].modifiers[0].compute).toHaveProperty(
       'amount',
-      2.24
+      2.2425
     );
     expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.985025
+      0.98483125
     );
 
     expect(newOrder.items[2].modifiers[0].compute).toHaveProperty(
       'amount',
-      0.97
+      0.9675
     );
     expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.4247
+      0.42489375
     );
   });
 
@@ -959,15 +959,15 @@ describe('Order actions', () => {
       tax: 7.21,
     });
     expect(newOrder.items[0]).toHaveProperty('total', 80.6);
-    expect(newOrder.items[1]).toHaveProperty('total', 13.7);
-    expect(newOrder.items[2]).toHaveProperty('total', 5.9);
+    expect(newOrder.items[1]).toHaveProperty('total', 13.69);
+    expect(newOrder.items[2]).toHaveProperty('total', 5.91);
     expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
       'amount',
       -13.2
     );
     expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
       'amount',
-      5.8
+      5.797
     );
 
     expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
@@ -976,7 +976,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.99
+      0.985025
     );
 
     expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
@@ -985,7 +985,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.42
+      0.4247
     );
   });
 
@@ -1133,40 +1133,40 @@ describe('Order actions', () => {
 
     const newOrder = pricingService.order.calculate(order);
 
-    expect(newOrder).toHaveProperty('total', 2.15);
+    expect(newOrder).toHaveProperty('total', 2.16);
     expect(newOrder).toHaveProperty('subTotal', 3);
     expect(newOrder).toHaveProperty('subTotals', {
       fixed: -1,
-      tax: 0.15,
+      tax: 0.16,
     });
     expect(newOrder.items[0]).toHaveProperty('total', 0.72);
     expect(newOrder.items[1]).toHaveProperty('total', 0.72);
-    expect(newOrder.items[2]).toHaveProperty('total', 0.71);
+    expect(newOrder.items[2]).toHaveProperty('total', 0.72);
     expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
       'amount',
-      -0.33
+      -0.3333333333333334
     );
     expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.05
+      0.051925
     );
 
     expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
       'amount',
-      -0.33
+      -0.3333333333333333
     );
     expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.05
+      0.051925
     );
 
     expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
       'amount',
-      -0.17
+      -0.16666666666666666
     );
     expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.05
+      0.051925
     );
   });
 
@@ -1261,14 +1261,23 @@ describe('Order actions', () => {
 
     const [item1, item2, item3] = newOrder.items;
     expect(newOrder).toHaveProperty('total', 12.5);
-    expect(item1).toHaveProperty('total', 3.66);
-    expect(item1.modifiers[1].compute).toHaveProperty('amount', 5.84);
+    expect(item1).toHaveProperty('total', 3.65);
+    expect(item1.modifiers[1].compute).toHaveProperty(
+      'amount',
+      5.846153846153846
+    );
 
     expect(item2).toHaveProperty('total', 5.38);
-    expect(item2.modifiers[1].compute).toHaveProperty('amount', 8.62);
+    expect(item2.modifiers[1].compute).toHaveProperty(
+      'amount',
+      8.615384615384615
+    );
 
     expect(item3).toHaveProperty('total', 3.46);
-    expect(item3.modifiers[1].compute).toHaveProperty('amount', 5.54);
+    expect(item3.modifiers[1].compute).toHaveProperty(
+      'amount',
+      5.538461538461538
+    );
   });
 
   test('Auto split a Parent Order', () => {
@@ -1602,7 +1611,7 @@ describe('Order actions', () => {
       discount: -10,
       fee: 2,
     });
-    expect(newOrder.items[0]).toHaveProperty('total', 8.08);
+    expect(newOrder.items[0]).toHaveProperty('total', 8.07);
     expect(newOrder.items[1]).toHaveProperty('total', 7.71);
     expect(newOrder.items[2]).toHaveProperty('total', 11.36);
     expect(newOrder.items[3]).toHaveProperty('total', 7.3);
@@ -1630,9 +1639,422 @@ describe('Order actions', () => {
       discount: -10,
       fee: 4,
     });
-    expect(newOrder.items[0]).toHaveProperty('total', 8.09);
+    expect(newOrder.items[0]).toHaveProperty('total', 8.08);
     expect(newOrder.items[1]).toHaveProperty('total', 7.7);
     expect(newOrder.items[2]).toHaveProperty('total', 11.36);
     expect(newOrder.items[3]).toHaveProperty('total', 9.3);
   });
+
+  test('CU-8678p4ky3. Get Balance to Pay from OrderItems', () => {
+    const orderItems = [
+      {
+        __typename: 'OrderItem',
+        modifiers: [
+          {
+            __typename: 'Modifier',
+            addModifiers: [],
+            delModifiers: [],
+            conditions: null,
+            compute: {
+              __typename: 'Compute',
+              type: 'percentage',
+              action: 'add',
+              amount: 7.75,
+            },
+            _createdAt: '2023-08-22T16:30:44.899Z',
+            _updatedAt: '2023-08-22T16:30:44.899Z',
+            _id: '64e4e29b9f97bb39b2c97833',
+            modifierId: '63d43d0bc159330012809f6a',
+            _parentId: null,
+            locked: false,
+            name: '7.75% Tax',
+            sku: '',
+            description: '',
+            group: 'Tax',
+            type: 'tax',
+            attributes: ['sort'],
+            color: '',
+            backgroundColor: '',
+            icon: '',
+            url: '',
+            tags: ['default'],
+            order: 99,
+            included: false,
+            direct: true,
+            hidden: true,
+            print: true,
+            required: true,
+            recommended: false,
+            default: false,
+            code: '',
+            properties: {
+              sort: 99,
+            },
+            _computed: {
+              amount: 0.42625,
+              description: '7.75% Tax ($0.43)',
+            },
+          },
+        ],
+        notes: [],
+        totalPaid: 0,
+        status: {
+          picked: {
+            value: false,
+            date: '',
+          },
+          paid: {
+            value: false,
+            date: '',
+          },
+          tracker: [],
+        },
+        _id: '64e4e29b9f97bb39b2c97832',
+        itemId: '64d3a7632d91061420342650',
+        name: 'NAPKIN CKTL SAMSARA',
+        description: '',
+        modifiersTotalAmount: 0,
+        location: null,
+        price: 5.5,
+        pieces: 1,
+        quantity: 1,
+        path: [],
+        menuId: '63d43ec012bb091db8c62f87',
+        serial: null,
+        sku: '025096975858',
+        total: 5.93,
+        subTotals: {
+          _included: 0,
+          _xincluded: 0.42625,
+          _direct: 0.42625,
+          _xdirect: 0,
+          _simple: 5.5,
+          _actual: 5.5,
+          tax: 0.42625,
+        },
+        taxes: [],
+        properties: false,
+      },
+      {
+        __typename: 'OrderItem',
+        modifiers: [
+          {
+            __typename: 'Modifier',
+            addModifiers: [],
+            delModifiers: [],
+            conditions: null,
+            compute: {
+              __typename: 'Compute',
+              type: 'percentage',
+              action: 'add',
+              amount: 7.75,
+            },
+            _createdAt: '2023-08-22T16:30:44.899Z',
+            _updatedAt: '2023-08-22T16:30:44.899Z',
+            _id: '64e4e2939f97bb39b2c977f5',
+            modifierId: '63d43d0bc159330012809f6a',
+            _parentId: null,
+            locked: false,
+            name: '7.75% Tax',
+            sku: '',
+            description: '',
+            group: 'Tax',
+            type: 'tax',
+            attributes: ['sort'],
+            color: '',
+            backgroundColor: '',
+            icon: '',
+            url: '',
+            tags: ['default'],
+            order: 99,
+            included: false,
+            direct: true,
+            hidden: true,
+            print: true,
+            required: true,
+            recommended: false,
+            default: false,
+            code: '',
+            properties: {
+              sort: 99,
+            },
+            _computed: {
+              amount: 2.47225,
+              description: '7.75% Tax ($2.47)',
+            },
+          },
+        ],
+        notes: [],
+        totalPaid: 0,
+        status: {
+          picked: {
+            value: false,
+            date: '',
+          },
+          paid: {
+            value: false,
+            date: '',
+          },
+          tracker: [],
+        },
+        _id: '64e4e2939f97bb39b2c977f4',
+        itemId: '64c58811c3b8118e1c2f144e',
+        name: 'Boxwood Orb 2/Asst.',
+        description: '',
+        modifiersTotalAmount: 0,
+        location: null,
+        price: 15.95,
+        pieces: 1,
+        quantity: 2,
+        path: [],
+        menuId: '63d43ec012bb091db8c62f87',
+        serial: null,
+        sku: '023271797394',
+        total: 34.37,
+        subTotals: {
+          _included: 0,
+          _xincluded: 2.47225,
+          _direct: 2.47225,
+          _xdirect: 0,
+          _simple: 31.9,
+          _actual: 31.9,
+          tax: 2.47225,
+        },
+        taxes: [],
+        properties: false,
+      },
+      {
+        __typename: 'OrderItem',
+        modifiers: [
+          {
+            __typename: 'Modifier',
+            addModifiers: [],
+            delModifiers: [],
+            conditions: null,
+            compute: {
+              __typename: 'Compute',
+              type: 'percentage',
+              action: 'add',
+              amount: 7.75,
+            },
+            _createdAt: '2023-08-22T16:30:44.899Z',
+            _updatedAt: '2023-08-22T16:30:44.899Z',
+            _id: '64e4e2879f97bb39b2c97799',
+            modifierId: '63d43d0bc159330012809f6a',
+            _parentId: null,
+            locked: false,
+            name: '7.75% Tax',
+            sku: '',
+            description: '',
+            group: 'Tax',
+            type: 'tax',
+            attributes: ['sort'],
+            color: '',
+            backgroundColor: '',
+            icon: '',
+            url: '',
+            tags: ['default'],
+            order: 99,
+            included: false,
+            direct: true,
+            hidden: true,
+            print: true,
+            required: true,
+            recommended: false,
+            default: false,
+            code: '',
+            properties: {
+              sort: 99,
+            },
+            _computed: {
+              amount: 4.495,
+              description: '7.75% Tax ($4.50)',
+            },
+          },
+        ],
+        notes: [],
+        totalPaid: 0,
+        status: {
+          picked: {
+            value: false,
+            date: '',
+          },
+          paid: {
+            value: false,
+            date: '',
+          },
+          tracker: [],
+        },
+        _id: '64e4e2879f97bb39b2c97798',
+        itemId: '6453fce8ecba74556efe8c71',
+        name: 'BASKET WILLOW MARKET',
+        description: '',
+        modifiersTotalAmount: 0,
+        location: null,
+        price: 58,
+        pieces: 1,
+        quantity: 1,
+        path: [],
+        menuId: '63d43ec012bb091db8c62f87',
+        serial: null,
+        sku: 'LC1900',
+        total: 62.5,
+        subTotals: {
+          _included: 0,
+          _xincluded: 4.495,
+          _direct: 4.495,
+          _xdirect: 0,
+          _simple: 58,
+          _actual: 58,
+          tax: 4.495,
+        },
+        taxes: [],
+        properties: false,
+      },
+    ];
+
+    const balanceToPay = pricingService.item.getBalanceToPay({ orderItems });
+
+    expect(balanceToPay).toBe(102.79);
+  });
+});
+
+test('CU-8678p4ky3. Get Calculated order. Multiple Items. 2 Modifiers. 1 Item tax. 1 Orde discount', () => {
+  const taxMod = {
+    _id: 2,
+    name: `7.75% tax`,
+    type: 'tax',
+    compute: {
+      amount: 7.75,
+      type: 'percentage',
+      action: 'add',
+    },
+    properties: {
+      sort: 2,
+    },
+  };
+
+  const discountMod = {
+    _id: 1,
+    compute: {
+      amount: 15,
+      type: 'percentage',
+      action: 'subtract',
+    },
+    name: `15%`,
+    type: 'percentage',
+    properties: {
+      sort: 1,
+    },
+  };
+
+  const item1 = {
+    _id: 1,
+    price: 35.95,
+    quantity: 2,
+    modifiers: [taxMod],
+  };
+  const item2 = {
+    _id: 2,
+    price: 28.95,
+    quantity: 2,
+    modifiers: [taxMod],
+  };
+  const item3 = {
+    _id: 3,
+    price: 17.95,
+    quantity: 4,
+    modifiers: [taxMod],
+  };
+  const item4 = {
+    _id: 4,
+    price: 158,
+    quantity: 1,
+    modifiers: [taxMod],
+  };
+  const item5 = {
+    _id: 5,
+    price: 148,
+    quantity: 2,
+    modifiers: [taxMod],
+  };
+  const item6 = {
+    _id: 6,
+    price: 120,
+    quantity: 1,
+    modifiers: [taxMod],
+  };
+
+  const order = {
+    items: [item1, item2, item3, item4, item5, item6],
+    modifiers: [discountMod],
+  };
+
+  const newOrder = pricingService.order.calculate(order);
+
+  expect(newOrder).toHaveProperty('total', 710.35);
+  expect(newOrder).toHaveProperty('subTotal', 775.6);
+  expect(newOrder).toHaveProperty('subTotals', {
+    percentage: -116.34,
+    tax: 51.09,
+  });
+  expect(newOrder.items[0]).toHaveProperty('total', 65.85);
+  expect(newOrder.items[1]).toHaveProperty('total', 53.03);
+  expect(newOrder.items[2]).toHaveProperty('total', 65.76);
+  expect(newOrder.items[3]).toHaveProperty('total', 144.71);
+  expect(newOrder.items[4]).toHaveProperty('total', 271.1);
+  expect(newOrder.items[5]).toHaveProperty('total', 109.91);
+  expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
+    'amount',
+    -10.785
+  );
+  expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
+    'amount',
+    4.7364125
+  );
+
+  expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
+    'amount',
+    -8.685
+  );
+  expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
+    'amount',
+    3.8141625
+  );
+
+  expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
+    'amount',
+    -10.77
+  );
+  expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
+    'amount',
+    4.729825
+  );
+
+  expect(newOrder.items[3].modifiers[0]._computed).toHaveProperty(
+    'amount',
+    -23.7
+  );
+  expect(newOrder.items[3].modifiers[1]._computed).toHaveProperty(
+    'amount',
+    10.40825
+  );
+
+  expect(newOrder.items[4].modifiers[0]._computed).toHaveProperty(
+    'amount',
+    -44.4
+  );
+  expect(newOrder.items[4].modifiers[1]._computed).toHaveProperty(
+    'amount',
+    19.499
+  );
+
+  expect(newOrder.items[5].modifiers[0]._computed).toHaveProperty(
+    'amount',
+    -18
+  );
+  expect(newOrder.items[5].modifiers[1]._computed).toHaveProperty(
+    'amount',
+    7.905
+  );
 });

package/lib/item/calculate.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-syntax */
-module.exports = ({ _, utils, modifierActions }) => {
+module.exports = ({ _, utils, actions, modifierActions }) => {
   const { math } = utils;
   //
   const calculateOne = inputItem => {
@@ -98,9 +98,7 @@ module.exports = ({ _, utils, modifierActions }) => {
 
     subTotals._actual = math.add(subTotals._simple, subTotals._included);
 
-    const total = math.toDecimalPlaces(
-      math.add(subTotals._actual, subTotals._xincluded)
-    );
+    const total = math.toDecimalPlaces(actions.getTotal({ subTotals }));
 
     return {
       ...item,

package/lib/item/getBalanceToPay.js

@@ -1,12 +1,12 @@
-module.exports = ({ utils }) =>
+module.exports = ({ utils, actions }) =>
   function getBalanceToPay({ orderItems = [] }) {
     const total = orderItems.reduce(
-      (t, item) => utils.math.add(t, item && item.total),
+      (t, item) => utils.math.add(actions.getTotal(item), t),
       0
     );
     const totalPaid = orderItems.reduce(
       (t, item) => utils.math.add(t, item && item.totalPaid),
       0
     );
-    return utils.math.sub(total, totalPaid);
+    return utils.math.toDecimalPlaces(utils.math.sub(total, totalPaid));
   };

package/lib/item/getTotal.js

@@ -2,7 +2,6 @@ module.exports = ({ utils }) => {
   const { math } = utils;
   return function getTotal(item) {
     if (!item || !item.subTotals) return 0;
-
-    return math.add(item.subTotals._simple, item.subTotals._xincluded);
+    return math.add(item.subTotals._actual, item.subTotals._xincluded);
   };
 };

package/lib/modifier/createIndirectModifier.js

@@ -16,14 +16,12 @@ module.exports = ({ _, utils, constants, actions }) => {
     let modifierAmount = amount;
 
     if (type === Modifier.Compute.Types.PERCENTAGE) {
-      const modifierAmountByPercentage = math.toDecimalPlaces(
-        math.div(
-          math.mul(
-            modifier.type === 'credit' ? options.orderTotal : options.itemTotal,
-            amount
-          ),
-          100
-        )
+      const modifierAmountByPercentage = math.div(
+        math.mul(
+          modifier.type === 'credit' ? options.orderTotal : options.itemTotal,
+          amount
+        ),
+        100
       );
       modifierAmount =
         maxAmount !== null && modifierAmountByPercentage > maxAmount
@@ -37,12 +35,10 @@ module.exports = ({ _, utils, constants, actions }) => {
       !math.isZero(options.orderTotal) &&
       (type !== Modifier.Compute.Types.PERCENTAGE || modifier.type === 'credit')
     ) {
-      amountToApply = math.toDecimalPlaces(
-        math.div(
-          math.mul(modifierAmount, options.itemTotal),
-          options.orderTotal,
-          options.itemQuantity
-        )
+      amountToApply = math.div(
+        math.mul(modifierAmount, options.itemTotal),
+        options.orderTotal,
+        options.itemQuantity
       );
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -36,5 +36,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "6648705882ec8351463ba823c213cf7c198129ce"
+  "gitHead": "a5c31d32fc9c21bc3d643d02e1171438b38f6826"
 }