@darkpos/pricing 1.0.24 → 1.0.25

package/__TEST__/order/order.test.js

@@ -124,7 +124,7 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('subTotals', {
       discount: -2,
     });
-    expect(newOrder.items[0]).toHaveProperty('total', 58.29);
+    expect(newOrder.items[0]).toHaveProperty('total', 58.285714285714285);
     expect(newOrder.items[0]).toHaveProperty('subTotals', {
       discount: -1.7142857142857142,
       _included: 0,
@@ -134,7 +134,7 @@ describe('Order actions', () => {
       _simple: 60,
       _actual: 60,
     });
-    expect(newOrder.items[1]).toHaveProperty('total', 9.71);
+    expect(newOrder.items[1]).toHaveProperty('total', 9.714285714285714);
     expect(newOrder.items[1]).toHaveProperty('subTotals', {
       discount: -0.2857142857142857,
       _included: 0,
@@ -173,7 +173,7 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('subTotals', {
       discount: -2.06,
     });
-    expect(newOrder.items[0]).toHaveProperty('total', 14.39);
+    expect(newOrder.items[0]).toHaveProperty('total', 14.391);
     expect(newOrder.items[0]).toHaveProperty('subTotals', {
       discount: -1.599,
       _included: 0,
@@ -183,7 +183,7 @@ describe('Order actions', () => {
       _simple: 15.99,
       _actual: 15.99,
     });
-    expect(newOrder.items[1]).toHaveProperty('total', 4.19);
+    expect(newOrder.items[1]).toHaveProperty('total', 4.185);
     expect(newOrder.items[1]).toHaveProperty('subTotals', {
       discount: -0.465,
       _included: 0,
@@ -682,9 +682,9 @@ describe('Order actions', () => {
       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]).toHaveProperty('total', 80.597);
+    expect(newOrder.items[1]).toHaveProperty('total', 13.69233125);
+    expect(newOrder.items[2]).toHaveProperty('total', 5.90739375);
     expect(newOrder.items[0].modifiers[0].compute).toHaveProperty(
       'amount',
       13.2
@@ -700,7 +700,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[1].modifiers[1].compute).toHaveProperty(
       'amount',
-      0.985025
+      0.98483125
     );
 
     expect(newOrder.items[2].modifiers[0].compute).toHaveProperty(
@@ -709,7 +709,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[2].modifiers[1].compute).toHaveProperty(
       'amount',
-      0.4247
+      0.42489375
     );
   });
 
@@ -774,9 +774,9 @@ describe('Order actions', () => {
       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]).toHaveProperty('total', 80.597);
+    expect(newOrder.items[1]).toHaveProperty('total', 13.69233125);
+    expect(newOrder.items[2]).toHaveProperty('total', 5.90739375);
     expect(newOrder.items[0].modifiers[0].compute).toHaveProperty(
       'amount',
       13.2
@@ -866,9 +866,9 @@ describe('Order actions', () => {
       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]).toHaveProperty('total', 80.597);
+    expect(newOrder.items[1]).toHaveProperty('total', 13.69233125);
+    expect(newOrder.items[2]).toHaveProperty('total', 5.90739375);
     expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
       'amount',
       -13.2
@@ -958,9 +958,9 @@ describe('Order actions', () => {
       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]).toHaveProperty('total', 80.597);
+    expect(newOrder.items[1]).toHaveProperty('total', 13.69233125);
+    expect(newOrder.items[2]).toHaveProperty('total', 5.90739375);
     expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
       'amount',
       -13.2
@@ -976,7 +976,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.985025
+      0.98483125
     );
 
     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.4247
+      0.42489375
     );
   });
 
@@ -1139,16 +1139,16 @@ describe('Order actions', () => {
       fixed: -1,
       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.72);
+    expect(newOrder.items[0]).toHaveProperty('total', 0.7183333333333333);
+    expect(newOrder.items[1]).toHaveProperty('total', 0.7183333333333334);
+    expect(newOrder.items[2]).toHaveProperty('total', 0.7183333333333334);
     expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
       'amount',
       -0.3333333333333334
     );
     expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.051925
+      0.05166666666666666
     );
 
     expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
@@ -1157,7 +1157,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.051925
+      0.05166666666666667
     );
 
     expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
@@ -1166,7 +1166,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.051925
+      0.05166666666666667
     );
   });
 
@@ -1261,19 +1261,19 @@ describe('Order actions', () => {
 
     const [item1, item2, item3] = newOrder.items;
     expect(newOrder).toHaveProperty('total', 12.5);
-    expect(item1).toHaveProperty('total', 3.65);
+    expect(item1).toHaveProperty('total', 3.653846153846154);
     expect(item1.modifiers[1].compute).toHaveProperty(
       'amount',
       5.846153846153846
     );
 
-    expect(item2).toHaveProperty('total', 5.38);
+    expect(item2).toHaveProperty('total', 5.3846153846153854615384615385);
     expect(item2.modifiers[1].compute).toHaveProperty(
       'amount',
       8.615384615384615
     );
 
-    expect(item3).toHaveProperty('total', 3.46);
+    expect(item3).toHaveProperty('total', 3.461538461538462);
     expect(item3.modifiers[1].compute).toHaveProperty(
       'amount',
       5.538461538461538
@@ -1611,10 +1611,10 @@ describe('Order actions', () => {
       discount: -10,
       fee: 2,
     });
-    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);
+    expect(newOrder.items[0]).toHaveProperty('total', 8.074852767962309);
+    expect(newOrder.items[1]).toHaveProperty('total', 7.709658421672556);
+    expect(newOrder.items[2]).toHaveProperty('total', 11.361601884570083);
+    expect(newOrder.items[3]).toHaveProperty('total', 7.303886925795053);
   });
   test('Get calculated PARTIALLY PAID Order, multiple items and paymentModifiers', () => {
     const paymentModifiers = orderModifiersPartiallyPaid.map(orderMod =>
@@ -1639,10 +1639,10 @@ describe('Order actions', () => {
       discount: -10,
       fee: 4,
     });
-    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);
+    expect(newOrder.items[0]).toHaveProperty('total', 8.083543307086615);
+    expect(newOrder.items[1]).toHaveProperty('total', 7.703779527559055);
+    expect(newOrder.items[2]).toHaveProperty('total', 11.36191226096738);
+    expect(newOrder.items[3]).toHaveProperty('total', 9.300764904386952);
   });
 
   test('CU-8678p4ky3. Get Balance to Pay from OrderItems', () => {
@@ -1998,12 +1998,12 @@ test('CU-8678p4ky3. Get Calculated order. Multiple Items. 2 Modifiers. 1 Item ta
     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]).toHaveProperty('total', 65.8514125);
+  expect(newOrder.items[1]).toHaveProperty('total', 53.0291625);
+  expect(newOrder.items[2]).toHaveProperty('total', 65.759825);
+  expect(newOrder.items[3]).toHaveProperty('total', 144.70825);
+  expect(newOrder.items[4]).toHaveProperty('total', 271.099);
+  expect(newOrder.items[5]).toHaveProperty('total', 109.905);
   expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
     'amount',
     -10.785
@@ -2058,3 +2058,67 @@ test('CU-8678p4ky3. Get Calculated order. Multiple Items. 2 Modifiers. 1 Item ta
     7.905
   );
 });
+
+test('CU-8678tdrvq. Get Calculated order. Multiple Items. 1 Order tax', () => {
+  const taxMod = {
+    _id: 2,
+    name: `7.75% tax`,
+    type: 'tax',
+    compute: {
+      amount: 7.75,
+      type: 'percentage',
+      action: 'add',
+    },
+    properties: {
+      sort: 2,
+    },
+  };
+
+  const item1 = {
+    _id: 1,
+    price: 38,
+    quantity: 1,
+    modifiers: [],
+  };
+  const item2 = {
+    _id: 2,
+    price: 42,
+    quantity: 1,
+    modifiers: [],
+  };
+  const item3 = {
+    _id: 3,
+    price: 48,
+    quantity: 1,
+    modifiers: [],
+  };
+
+  const order = {
+    items: [item1, item2, item3],
+    modifiers: [taxMod],
+  };
+
+  const newOrder = pricingService.order.calculate(order);
+
+  expect(newOrder).toHaveProperty('total', 137.92);
+  expect(newOrder).toHaveProperty('subTotal', 128);
+  expect(newOrder).toHaveProperty('subTotals', {
+    tax: 9.92,
+  });
+  expect(newOrder.items[0]).toHaveProperty('total', 40.945);
+  expect(newOrder.items[1]).toHaveProperty('total', 45.255);
+  expect(newOrder.items[2]).toHaveProperty('total', 51.72);
+  expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
+    'amount',
+    2.945
+  );
+
+  expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
+    'amount',
+    3.255
+  );
+  expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
+    'amount',
+    3.72
+  );
+});

package/lib/item/calculate.js

@@ -98,7 +98,7 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
 
     subTotals._actual = math.add(subTotals._simple, subTotals._included);
 
-    const total = math.toDecimalPlaces(actions.getTotal({ subTotals }));
+    const total = actions.getTotal({ subTotals });
 
     return {
       ...item,

package/package.json

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