@darkpos/pricing 1.0.21 → 1.0.23

package/__TEST__/order/order.test.js

@@ -94,7 +94,6 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('subTotals', {
       discount: -6,
     });
-    // console.log(JSON.stringify(newOrder, 0, 2));
   });
   test('Get calculated Order, multiple items and indirect modifiers', () => {
     const item1 = {
@@ -125,23 +124,23 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('subTotals', {
       discount: -2,
     });
-    expect(newOrder.items[0]).toHaveProperty('total', 58.28);
+    expect(newOrder.items[0]).toHaveProperty('total', 58.29);
     expect(newOrder.items[0]).toHaveProperty('subTotals', {
-      discount: -1.72,
+      discount: -1.71,
       _included: 0,
-      _xincluded: -1.72,
+      _xincluded: -1.71,
       _direct: 0,
-      _xdirect: -1.72,
+      _xdirect: -1.71,
       _simple: 60,
       _actual: 60,
     });
-    expect(newOrder.items[1]).toHaveProperty('total', 9.72);
+    expect(newOrder.items[1]).toHaveProperty('total', 9.71);
     expect(newOrder.items[1]).toHaveProperty('subTotals', {
-      discount: -0.28,
+      discount: -0.29,
       _included: 0,
-      _xincluded: -0.28,
+      _xincluded: -0.29,
       _direct: 0,
-      _xdirect: -0.28,
+      _xdirect: -0.29,
       _simple: 10,
       _actual: 10,
     });
@@ -169,10 +168,10 @@ describe('Order actions', () => {
 
     const order = { items: [item1, item2], modifiers: [modifier1] };
     const newOrder = pricingService.order.calculate(order);
-    expect(newOrder).toHaveProperty('total', 18.58);
+    expect(newOrder).toHaveProperty('total', 18.57);
     expect(newOrder).toHaveProperty('subTotal', 20.64);
     expect(newOrder).toHaveProperty('subTotals', {
-      discount: -2.06,
+      discount: -2.07,
     });
     expect(newOrder.items[0]).toHaveProperty('total', 14.39);
     expect(newOrder.items[0]).toHaveProperty('subTotals', {
@@ -184,13 +183,13 @@ describe('Order actions', () => {
       _simple: 15.99,
       _actual: 15.99,
     });
-    expect(newOrder.items[1]).toHaveProperty('total', 4.19);
+    expect(newOrder.items[1]).toHaveProperty('total', 4.18);
     expect(newOrder.items[1]).toHaveProperty('subTotals', {
-      discount: -0.46,
+      discount: -0.47,
       _included: 0,
-      _xincluded: -0.46,
+      _xincluded: -0.47,
       _direct: 0,
-      _xdirect: -0.46,
+      _xdirect: -0.47,
       _simple: 4.65,
       _actual: 4.65,
     });
@@ -246,19 +245,1030 @@ describe('Order actions', () => {
     });
   });
 
+  test('Get calculated Order, multiple items and indirect modifiers with sort # 1', () => {
+    const item1 = {
+      _id: 1,
+      price: 3,
+      quantity: 1,
+    };
+    const item2 = {
+      _id: 2,
+      price: 3,
+      quantity: 1,
+    };
+    const item3 = {
+      _id: 3,
+      price: 4,
+      quantity: 1,
+    };
+    const modifier1 = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `10% Discount`,
+      type: 'discount',
+    };
+
+    const modifier2 = {
+      _id: 2,
+      name: `20% tax`,
+      type: 'tax',
+      compute: {
+        amount: 20,
+        type: 'percentage',
+        action: 'add',
+      },
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [modifier2, modifier1],
+    };
+    const newOrder = pricingService.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 11);
+    expect(newOrder).toHaveProperty('subTotal', 10);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -1,
+      tax: 2,
+    });
+  });
+
+  test('Get calculated Order, multiple items and indirect modifiers with sort # 2', () => {
+    const item1 = {
+      _id: 1,
+      price: 3,
+      quantity: 1,
+    };
+    const item2 = {
+      _id: 2,
+      price: 3,
+      quantity: 1,
+    };
+    const item3 = {
+      _id: 3,
+      price: 4,
+      quantity: 1,
+    };
+    const modifier1 = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `10% Discount`,
+      type: 'discount',
+      properties: {
+        sort: 1,
+      },
+    };
+
+    const modifier2 = {
+      _id: 2,
+      name: `20% tax`,
+      type: 'tax',
+      compute: {
+        amount: 20,
+        type: 'percentage',
+        action: 'add',
+      },
+      properties: {
+        sort: 2,
+      },
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [modifier2, modifier1],
+    };
+    const newOrder = pricingService.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 10.8);
+    expect(newOrder).toHaveProperty('subTotal', 10);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -1,
+      tax: 1.8,
+    });
+  });
+
+  test('Get calculated Order, multiple items and indirect modifiers with sort #3', () => {
+    const item1 = {
+      _id: 1,
+      price: 3,
+      quantity: 1,
+    };
+    const item2 = {
+      _id: 2,
+      price: 3,
+      quantity: 1,
+    };
+    const item3 = {
+      _id: 3,
+      price: 4,
+      quantity: 1,
+    };
+    const modifier1 = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `10% Discount`,
+      type: 'discount',
+      properties: {
+        sort: 2,
+      },
+    };
+
+    const modifier2 = {
+      _id: 2,
+      name: `20% tax`,
+      type: 'tax',
+      compute: {
+        amount: 20,
+        type: 'percentage',
+        action: 'add',
+      },
+      properties: {
+        sort: 1,
+      },
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [modifier1, modifier2],
+    };
+    const newOrder = pricingService.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 10.8);
+    expect(newOrder).toHaveProperty('subTotal', 10);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -1.2,
+      tax: 2,
+    });
+  });
+
+  test('Get calculated Order, multiple items and indirect modifiers with sort #4', () => {
+    const item1 = {
+      _id: 1,
+      price: 3,
+      quantity: 1,
+    };
+    const item2 = {
+      _id: 2,
+      price: 3,
+      quantity: 1,
+    };
+    const item3 = {
+      _id: 3,
+      price: 4,
+      quantity: 1,
+    };
+    const modifier1 = {
+      _id: 1,
+      compute: {
+        amount: 5,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `5$ Discount`,
+      type: 'discount',
+      properties: {
+        sort: 2,
+      },
+    };
+
+    const modifier2 = {
+      _id: 2,
+      name: `20% tax`,
+      type: 'tax',
+      compute: {
+        amount: 20,
+        type: 'percentage',
+        action: 'add',
+      },
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [modifier1, modifier2],
+    };
+    const newOrder = pricingService.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 7);
+    expect(newOrder).toHaveProperty('subTotal', 10);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -5,
+      tax: 2,
+    });
+  });
+
+  test('Get calculated Order, multiple items and indirect modifiers with sort #5', () => {
+    const item1 = {
+      _id: 1,
+      price: 3,
+      quantity: 1,
+    };
+    const item2 = {
+      _id: 2,
+      price: 3,
+      quantity: 1,
+    };
+    const item3 = {
+      _id: 3,
+      price: 4,
+      quantity: 1,
+    };
+    const modifier1 = {
+      _id: 1,
+      compute: {
+        amount: 5,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `5$ Discount`,
+      type: 'discount',
+    };
+
+    const modifier2 = {
+      _id: 2,
+      name: `20% tax`,
+      type: 'tax',
+      compute: {
+        amount: 20,
+        type: 'percentage',
+        action: 'add',
+      },
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [modifier1, modifier2],
+    };
+    const newOrder = pricingService.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 7);
+    expect(newOrder).toHaveProperty('subTotal', 10);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -5,
+      tax: 2,
+    });
+  });
+
+  test('Get calculated Order, multiple items and indirect modifiers with sort #6', () => {
+    const item1 = {
+      _id: 1,
+      price: 3,
+      quantity: 1,
+    };
+    const item2 = {
+      _id: 2,
+      price: 3,
+      quantity: 1,
+    };
+    const item3 = {
+      _id: 3,
+      price: 4,
+      quantity: 1,
+    };
+    const modifier1 = {
+      _id: 1,
+      compute: {
+        amount: 5,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `5% Discount`,
+      type: 'discount',
+      properties: {
+        sort: 2,
+      },
+    };
+
+    const modifier2 = {
+      _id: 2,
+      name: `20% tax`,
+      type: 'tax',
+      compute: {
+        amount: 20,
+        type: 'percentage',
+        action: 'add',
+      },
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [modifier1, modifier2],
+    };
+    const newOrder = pricingService.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 11.5);
+    expect(newOrder).toHaveProperty('subTotal', 10);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -0.5,
+      tax: 2,
+    });
+  });
+
+  test('Get calculated Order, multiple items and indirect modifiers with sort # 7', () => {
+    const item1 = {
+      _id: 1,
+      price: 3,
+      quantity: 1,
+    };
+    const item2 = {
+      _id: 2,
+      price: 3,
+      quantity: 1,
+    };
+    const item3 = {
+      _id: 3,
+      price: 4,
+      quantity: 1,
+    };
+    const modifier1 = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `10% Discount`,
+      type: 'discount',
+      properties: {
+        sort: 1,
+      },
+    };
+
+    const modifier2 = {
+      _id: 2,
+      name: `20% tax`,
+      type: 'tax',
+      compute: {
+        amount: 20,
+        type: 'percentage',
+        action: 'add',
+      },
+      properties: {
+        sort: 1,
+      },
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [modifier2, modifier1],
+    };
+    const newOrder = pricingService.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 11);
+    expect(newOrder).toHaveProperty('subTotal', 10);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -1,
+      tax: 2,
+    });
+  });
+
+  test('CU-861n7pum9 - Get calculated Order, multiple items, 2 modifiers: 1 order discount (sort 1), 1 order tax (sort 99)', () => {
+    const item1 = {
+      _id: 1,
+      price: 44,
+      quantity: 2,
+    };
+    const item2 = {
+      _id: 2,
+      price: 14.95,
+      quantity: 1,
+    };
+    const item3 = {
+      _id: 3,
+      price: 2.15,
+      quantity: 3,
+    };
+    const discountMod = {
+      _id: 1,
+      compute: {
+        amount: 15,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `15% Discount`,
+      type: 'discount',
+      properties: {
+        sort: 1,
+      },
+    };
+    const taxMod = {
+      _id: 2,
+      name: `7.75% tax`,
+      type: 'tax',
+      compute: {
+        amount: 7.75,
+        type: 'percentage',
+        action: 'add',
+      },
+      properties: {
+        sort: 99,
+      },
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [discountMod, taxMod],
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 100.2);
+    expect(newOrder).toHaveProperty('subTotal', 109.4);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -16.41,
+      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[0].modifiers[0].compute).toHaveProperty(
+      'amount',
+      13.2
+    );
+    expect(newOrder.items[0].modifiers[1].compute).toHaveProperty(
+      'amount',
+      5.8
+    );
+
+    expect(newOrder.items[1].modifiers[0].compute).toHaveProperty(
+      'amount',
+      2.24
+    );
+    expect(newOrder.items[1].modifiers[1].compute).toHaveProperty(
+      'amount',
+      0.99
+    );
+
+    expect(newOrder.items[2].modifiers[0].compute).toHaveProperty(
+      'amount',
+      0.97
+    );
+    expect(newOrder.items[2].modifiers[1].compute).toHaveProperty(
+      'amount',
+      0.42
+    );
+  });
+
+  test(`CU-861n7pum9 -  Get calculated Order, multiple items, 2 modifiers: 1 order discount (sort 1), 1 item tax (sort 99)`, () => {
+    const taxMod = {
+      _id: 2,
+      name: `7.75% tax`,
+      type: 'tax',
+      compute: {
+        amount: 7.75,
+        type: 'percentage',
+        action: 'add',
+      },
+      properties: {
+        sort: 99,
+      },
+    };
+
+    const discountMod = {
+      _id: 1,
+      compute: {
+        amount: 15,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `15% Discount`,
+      type: 'discount',
+      properties: {
+        sort: 1,
+      },
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 44,
+      quantity: 2,
+      modifiers: [taxMod],
+    };
+    const item2 = {
+      _id: 2,
+      price: 14.95,
+      quantity: 1,
+      modifiers: [taxMod],
+    };
+    const item3 = {
+      _id: 3,
+      price: 2.15,
+      quantity: 3,
+      modifiers: [taxMod],
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [discountMod],
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 100.2);
+    expect(newOrder).toHaveProperty('subTotal', 109.4);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -16.41,
+      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[0].modifiers[0].compute).toHaveProperty(
+      'amount',
+      13.2
+    );
+    expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      5.797
+    );
+
+    expect(newOrder.items[1].modifiers[0].compute).toHaveProperty(
+      'amount',
+      2.24
+    );
+    expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0.985025
+    );
+
+    expect(newOrder.items[2].modifiers[0].compute).toHaveProperty(
+      'amount',
+      0.97
+    );
+    expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0.4247
+    );
+  });
+
+  test('CU-861n7pum9 - Get calculated Order, multiple items, 2 modifiers: 1 item discount (sort 1), 1 item tax (sort 99)', () => {
+    const taxMod = {
+      _id: 2,
+      name: `7.75% tax`,
+      type: 'tax',
+      compute: {
+        amount: 7.75,
+        type: 'percentage',
+        action: 'add',
+      },
+      properties: {
+        sort: 99,
+      },
+    };
+
+    const discountMod = {
+      _id: 1,
+      compute: {
+        amount: 15,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `15% Discount`,
+      type: 'discount',
+      properties: {
+        sort: 1,
+      },
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 44,
+      quantity: 2,
+      modifiers: [taxMod, discountMod],
+    };
+    const item2 = {
+      _id: 2,
+      price: 14.95,
+      quantity: 1,
+      modifiers: [taxMod, discountMod],
+    };
+    const item3 = {
+      _id: 3,
+      price: 2.15,
+      quantity: 3,
+      modifiers: [taxMod, discountMod],
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [],
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 100.2);
+    expect(newOrder).toHaveProperty('subTotal', 109.4);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -16.41,
+      tax: 7.21,
+    });
+    expect(newOrder.items[0]).toHaveProperty('total', 80.6);
+    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.797
+    );
+
+    expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -2.2425
+    );
+    expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0.98483125
+    );
+
+    expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -0.9675
+    );
+    expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0.42489375
+    );
+  });
+
+  test('CU-861n7pum9 - Get calculated Order, multiple items, 2 modifiers: 1 item discount (sort 1), 1 order tax (sort 99)', () => {
+    const taxMod = {
+      _id: 2,
+      name: `7.75% tax`,
+      type: 'tax',
+      compute: {
+        amount: 7.75,
+        type: 'percentage',
+        action: 'add',
+      },
+      properties: {
+        sort: 99,
+      },
+    };
+
+    const discountMod = {
+      _id: 1,
+      compute: {
+        amount: 15,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `15% Discount`,
+      type: 'discount',
+      properties: {
+        sort: 1,
+      },
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 44,
+      quantity: 2,
+      modifiers: [discountMod],
+    };
+    const item2 = {
+      _id: 2,
+      price: 14.95,
+      quantity: 1,
+      modifiers: [discountMod],
+    };
+    const item3 = {
+      _id: 3,
+      price: 2.15,
+      quantity: 3,
+      modifiers: [discountMod],
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [taxMod],
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 100.2);
+    expect(newOrder).toHaveProperty('subTotal', 109.4);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -16.41,
+      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[0].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -13.2
+    );
+    expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      5.8
+    );
+
+    expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -2.2425
+    );
+    expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0.99
+    );
+
+    expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -0.9675
+    );
+    expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0.42
+    );
+  });
+
+  test('CU-861n7pum9 - Get calculated Order, multiple items, 2 modifiers: 1 item discount (ignoreQty), 1 order tax', () => {
+    const taxMod = {
+      _id: 2,
+      name: `7.75% tax`,
+      type: 'tax',
+      compute: {
+        amount: 7.75,
+        type: 'percentage',
+        action: 'add',
+      },
+    };
+
+    const discountMod = {
+      _id: 1,
+      compute: {
+        amount: 1,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `1 USD`,
+      type: 'fixed',
+      properties: {
+        ignoreQuantity: true,
+      },
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 1,
+      quantity: 1,
+      modifiers: [discountMod],
+    };
+    const item2 = {
+      _id: 2,
+      price: 1,
+      quantity: 1,
+      modifiers: [discountMod],
+    };
+    const item3 = {
+      _id: 3,
+      price: 0.5,
+      quantity: 2,
+      modifiers: [discountMod],
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [taxMod],
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 0);
+    expect(newOrder).toHaveProperty('subTotal', 3);
+    expect(newOrder).toHaveProperty('subTotals', {
+      fixed: -3,
+      tax: 0,
+    });
+    expect(newOrder.items[0]).toHaveProperty('total', 0);
+    expect(newOrder.items[1]).toHaveProperty('total', 0);
+    expect(newOrder.items[2]).toHaveProperty('total', 0);
+    expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -1
+    );
+    expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0
+    );
+
+    expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -1
+    );
+    expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0
+    );
+
+    expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -1
+    );
+    expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0
+    );
+  });
+
+  test('CU-861n7pum9 - Get calculated Order, multiple items, 2 modifiers: 1 order discount (sort 1), 1 order tax (sort 2)', () => {
+    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: 1,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `1 USD`,
+      type: 'fixed',
+      properties: {
+        sort: 1,
+      },
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 1,
+      quantity: 1,
+      modifiers: [],
+    };
+    const item2 = {
+      _id: 2,
+      price: 1,
+      quantity: 1,
+      modifiers: [],
+    };
+    const item3 = {
+      _id: 3,
+      price: 0.5,
+      quantity: 2,
+      modifiers: [],
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [taxMod, discountMod],
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 2.15);
+    expect(newOrder).toHaveProperty('subTotal', 3);
+    expect(newOrder).toHaveProperty('subTotals', {
+      fixed: -1,
+      tax: 0.15,
+    });
+    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[0].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -0.33
+    );
+    expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0.05
+    );
+
+    expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -0.33
+    );
+    expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0.05
+    );
+
+    expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -0.17
+    );
+    expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0.05
+    );
+  });
+
+  test('CU-861n7pum9 - Get calculated Order, multiple items, 2 modifiers: 1 item discount, 1 order tax', () => {
+    const taxMod = {
+      _id: 2,
+      name: `7.75% tax`,
+      type: 'tax',
+      compute: {
+        amount: 7.75,
+        type: 'percentage',
+        action: 'add',
+      },
+    };
+
+    const discountMod = {
+      _id: 1,
+      compute: {
+        amount: 1,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `1 USD`,
+      type: 'fixed',
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 1,
+      quantity: 1,
+      modifiers: [discountMod],
+    };
+    const item2 = {
+      _id: 2,
+      price: 1,
+      quantity: 1,
+      modifiers: [discountMod],
+    };
+    const item3 = {
+      _id: 3,
+      price: 0.5,
+      quantity: 2,
+      modifiers: [discountMod],
+    };
+
+    const order = {
+      items: [item1, item2, item3],
+      modifiers: [taxMod],
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 0);
+    expect(newOrder).toHaveProperty('subTotal', 3);
+    expect(newOrder).toHaveProperty('subTotals', {
+      fixed: -3,
+      tax: 0,
+    });
+    expect(newOrder.items[0]).toHaveProperty('total', 0);
+    expect(newOrder.items[1]).toHaveProperty('total', 0);
+    expect(newOrder.items[2]).toHaveProperty('total', 0);
+    expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -1
+    );
+    expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0
+    );
+
+    expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -1
+    );
+    expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0
+    );
+
+    expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -1
+    );
+    expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
+      'amount',
+      0
+    );
+  });
+
   test('CU-3und87h : Calculate order with 20 USD credit', () => {
     const newOrder = pricingService.order.calculate(orderCredit);
 
     const [item1, item2, item3] = newOrder.items;
     expect(newOrder).toHaveProperty('total', 12.5);
-    expect(item1).toHaveProperty('total', 3.64);
-    expect(item1.modifiers[1].compute).toHaveProperty('amount', 5.86);
+    expect(item1).toHaveProperty('total', 3.66);
+    expect(item1.modifiers[1].compute).toHaveProperty('amount', 5.84);
 
-    expect(item2).toHaveProperty('total', 5.39);
-    expect(item2.modifiers[1].compute).toHaveProperty('amount', 8.61);
+    expect(item2).toHaveProperty('total', 5.38);
+    expect(item2.modifiers[1].compute).toHaveProperty('amount', 8.62);
 
-    expect(item3).toHaveProperty('total', 3.47);
-    expect(item3.modifiers[1].compute).toHaveProperty('amount', 5.53);
+    expect(item3).toHaveProperty('total', 3.46);
+    expect(item3.modifiers[1].compute).toHaveProperty('amount', 5.54);
   });
 
   test('Auto split a Parent Order', () => {
@@ -611,6 +1621,7 @@ describe('Order actions', () => {
       modifiers: paymentModifiers,
       order,
     });
+
     const newOrder = pricingService.order.calculate(order);
 
     expect(newOrder).toHaveProperty('total', 36.45);
@@ -619,9 +1630,9 @@ describe('Order actions', () => {
       discount: -10,
       fee: 4,
     });
-    expect(newOrder.items[0]).toHaveProperty('total', 8.07);
-    expect(newOrder.items[1]).toHaveProperty('total', 7.71);
-    expect(newOrder.items[2]).toHaveProperty('total', 11.37);
+    expect(newOrder.items[0]).toHaveProperty('total', 8.09);
+    expect(newOrder.items[1]).toHaveProperty('total', 7.7);
+    expect(newOrder.items[2]).toHaveProperty('total', 11.36);
     expect(newOrder.items[3]).toHaveProperty('total', 9.3);
   });
 });