@darkpos/pricing 1.0.44 → 1.0.46

package/__TEST__/order/order.test.js

@@ -127,7 +127,7 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('subTotals', {
       discount: -2,
     });
-    expect(newOrder.items[0]).toHaveProperty('total', 58.285714285714285);
+    expect(newOrder.items[0]).toHaveProperty('total', 58.29);
     expect(newOrder.items[0]).toHaveProperty('subTotals', {
       discount: -1.7142857142857142,
       _included: 0,
@@ -137,7 +137,7 @@ describe('Order actions', () => {
       _simple: 60,
       _actual: 60,
     });
-    expect(newOrder.items[1]).toHaveProperty('total', 9.714285714285714);
+    expect(newOrder.items[1]).toHaveProperty('total', 9.71);
     expect(newOrder.items[1]).toHaveProperty('subTotals', {
       discount: -0.2857142857142857,
       _included: 0,
@@ -174,9 +174,9 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('total', 18.58);
     expect(newOrder).toHaveProperty('subTotal', 20.64);
     expect(newOrder).toHaveProperty('subTotals', {
-      discount: -2.06,
+      discount: -2.064,
     });
-    expect(newOrder.items[0]).toHaveProperty('total', 14.391);
+    expect(newOrder.items[0]).toHaveProperty('total', 14.39);
     expect(newOrder.items[0]).toHaveProperty('subTotals', {
       discount: -1.599,
       _included: 0,
@@ -186,7 +186,7 @@ describe('Order actions', () => {
       _simple: 15.99,
       _actual: 15.99,
     });
-    expect(newOrder.items[1]).toHaveProperty('total', 4.185);
+    expect(newOrder.items[1]).toHaveProperty('total', 4.19);
     expect(newOrder.items[1]).toHaveProperty('subTotals', {
       discount: -0.465,
       _included: 0,
@@ -683,11 +683,11 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('subTotal', 109.4);
     expect(newOrder).toHaveProperty('subTotals', {
       discount: -16.41,
-      tax: 7.21,
+      tax: 7.206725,
     });
-    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]).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].compute).toHaveProperty(
       'amount',
       13.2
@@ -703,7 +703,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[1].modifiers[1].compute).toHaveProperty(
       'amount',
-      0.98483125
+      0.985025
     );
 
     expect(newOrder.items[2].modifiers[0].compute).toHaveProperty(
@@ -712,7 +712,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[2].modifiers[1].compute).toHaveProperty(
       'amount',
-      0.42489375
+      0.4247
     );
   });
 
@@ -775,11 +775,11 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('subTotal', 109.4);
     expect(newOrder).toHaveProperty('subTotals', {
       discount: -16.41,
-      tax: 7.21,
+      tax: 7.206725,
     });
-    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]).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].compute).toHaveProperty(
       'amount',
       13.2
@@ -867,11 +867,11 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('subTotal', 109.4);
     expect(newOrder).toHaveProperty('subTotals', {
       discount: -16.41,
-      tax: 7.21,
+      tax: 7.206725,
     });
-    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]).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
@@ -959,11 +959,11 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('subTotal', 109.4);
     expect(newOrder).toHaveProperty('subTotals', {
       discount: -16.41,
-      tax: 7.21,
+      tax: 7.206725,
     });
-    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]).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
@@ -979,7 +979,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.98483125
+      0.985025
     );
 
     expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
@@ -988,7 +988,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.42489375
+      0.4247
     );
   });
 
@@ -1140,18 +1140,18 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('subTotal', 3);
     expect(newOrder).toHaveProperty('subTotals', {
       fixed: -1,
-      tax: 0.16,
+      tax: 0.155775,
     });
-    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]).toHaveProperty('total', 0.72);
+    expect(newOrder.items[1]).toHaveProperty('total', 0.72);
+    expect(newOrder.items[2]).toHaveProperty('total', 0.72);
     expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
       'amount',
       -0.3333333333333334
     );
     expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.05166666666666666
+      0.051925
     );
 
     expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
@@ -1160,7 +1160,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[1].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.05166666666666667
+      0.051925
     );
 
     expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
@@ -1169,7 +1169,7 @@ describe('Order actions', () => {
     );
     expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
       'amount',
-      0.05166666666666667
+      0.051925
     );
   });
 
@@ -1264,19 +1264,19 @@ describe('Order actions', () => {
 
     const [item1, item2, item3] = newOrder.items;
     expect(newOrder).toHaveProperty('total', 12.5);
-    expect(item1).toHaveProperty('total', 3.653846153846154);
+    expect(item1).toHaveProperty('total', 3.66);
     expect(item1.modifiers[1].compute).toHaveProperty(
       'amount',
       5.846153846153846
     );
 
-    expect(item2).toHaveProperty('total', 5.3846153846153854615384615385);
+    expect(item2).toHaveProperty('total', 5.38);
     expect(item2.modifiers[1].compute).toHaveProperty(
       'amount',
       8.615384615384615
     );
 
-    expect(item3).toHaveProperty('total', 3.461538461538462);
+    expect(item3).toHaveProperty('total', 3.46);
     expect(item3.modifiers[1].compute).toHaveProperty(
       'amount',
       5.538461538461538
@@ -1591,62 +1591,6 @@ describe('Order actions', () => {
       'M-L 2pc Suit',
     ]);
   });
-  test('Get calculated UNPAID Order, multiple items and paymentModifiers', () => {
-    const paymentModifiers = orderModifiersNotPaid.map(orderMod =>
-      pricingService.modifier.createPaymentModifier({
-        modifier: orderMod,
-        items: inputItemsNotPaidOrder,
-      })
-    );
-
-    let order = { ...orderNotPaid };
-
-    order = pricingService.order.addModifiers({
-      modifiers: paymentModifiers,
-      order,
-    });
-    const paymentMethod = { type: 'cash' };
-    const newOrder = pricingService.order.calculate(order, { paymentMethod });
-
-    expect(newOrder).toHaveProperty('total', 34.45);
-    expect(newOrder).toHaveProperty('subTotal', 42.45);
-    expect(newOrder).toHaveProperty('subTotals', {
-      discount: -10,
-      fee: 2,
-    });
-    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 =>
-      pricingService.modifier.createPaymentModifier({
-        modifier: orderMod,
-        items: inputItemsPartiallyPaidOrder,
-      })
-    );
-
-    let order = { ...orderPartiallyPaid };
-
-    order = pricingService.order.addModifiers({
-      modifiers: paymentModifiers,
-      order,
-    });
-    const paymentMethod = { type: 'cash' };
-    const newOrder = pricingService.order.calculate(order, { paymentMethod });
-
-    expect(newOrder).toHaveProperty('total', 36.45);
-    expect(newOrder).toHaveProperty('subTotal', 42.45);
-    expect(newOrder).toHaveProperty('subTotals', {
-      discount: -10,
-      fee: 4,
-    });
-    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', () => {
     const orderItems = [
@@ -1916,9 +1860,11 @@ describe('Order actions', () => {
       },
     ];
 
-    const balanceToPay = pricingService.item.getBalanceToPay({ orderItems });
+    const balanceToPay = pricingService.item.getItemsBalance({
+      items: orderItems,
+    });
 
-    expect(balanceToPay).toBe(102.79);
+    expect(balanceToPay).toBe(102.8);
   });
 
   test('CU-8678p4ky3. Get Calculated order. Multiple Items. 2 Modifiers. 1 Item tax. 1 Orde discount', () => {
@@ -1994,18 +1940,18 @@ describe('Order actions', () => {
 
     const newOrder = pricingService.order.calculate(order);
 
-    expect(newOrder).toHaveProperty('total', 710.35);
+    expect(newOrder).toHaveProperty('total', 710.36);
     expect(newOrder).toHaveProperty('subTotal', 775.6);
     expect(newOrder).toHaveProperty('subTotals', {
       percentage: -116.34,
-      tax: 51.09,
+      tax: 51.09265,
     });
-    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]).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
@@ -2102,13 +2048,13 @@ describe('Order actions', () => {
 
     const newOrder = pricingService.order.calculate(order);
 
-    expect(newOrder).toHaveProperty('total', 137.92);
+    expect(newOrder).toHaveProperty('total', 137.93);
     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[0]).toHaveProperty('total', 40.95);
+    expect(newOrder.items[1]).toHaveProperty('total', 45.26);
     expect(newOrder.items[2]).toHaveProperty('total', 51.72);
     expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
       'amount',

package/__TEST__/order/pickEndDate.test.js

@@ -1,45 +1,11 @@
 const moment = require('moment-timezone');
-const _ = require('lodash');
-const pickEndDateFunction = require('../../lib/store/pickEndDate');
+const usePricing = require('../../lib/index');
+
+const pricingService = usePricing();
+const { pickEndDate } = pricingService.store;
 
 describe('pickEndDate function', () => {
   test('Get calculated Order, one item', () => {
-    const settings = {
-      localization: {
-        locale: 'en-US',
-        hour12: true,
-        currency: 'USD',
-        phoneFormat: 'NATIONAL',
-        timezone: 'America/New_York',
-        defaultCountry: {
-          label: 'United States',
-          value: 'US',
-        },
-        dateFormat: 'default',
-      },
-      schedule: {
-        open: [
-          {
-            groupId: '666b542d5ed0ff34672d9c14',
-            days: [6, 4, 3, 1, 2, 5],
-            startTime: '04:00',
-            endTime: '17:05',
-          },
-          {
-            startTime: '07:00',
-            endTime: '22:04',
-            days: [1, 2],
-          },
-        ],
-        close: [
-          {
-            date: '2024-08-27',
-          },
-        ],
-      },
-    };
-
-    const pickEndDate = pickEndDateFunction({ settings, _, moment });
     const schedule = {
       addDays: 1,
       hour: 17,
@@ -56,8 +22,8 @@ describe('pickEndDate function', () => {
 
     const expectedDate = now
       .clone()
-      .add(3, 'days')
-      .set({ hour: 0, minute: 0, second: 0 })
+      .add(2, 'days')
+      .set({ hour: schedule.hour, minute: schedule.minute, second: 0 })
       .utc()
       .format();
 
@@ -65,37 +31,6 @@ describe('pickEndDate function', () => {
   });
 
   test('Order falls on a closed day', () => {
-    const settings = {
-      localization: {
-        locale: 'en-US',
-        hour12: true,
-        currency: 'USD',
-        phoneFormat: 'NATIONAL',
-        timezone: 'America/New_York',
-        defaultCountry: {
-          label: 'United States',
-          value: 'US',
-        },
-        dateFormat: 'default',
-      },
-      schedule: {
-        open: [
-          {
-            groupId: '666b542d5ed0ff34672d9c14',
-            days: [1, 2, 3, 4, 5], // Monday to Friday
-            startTime: '04:00',
-            endTime: '17:05',
-          },
-        ],
-        close: [
-          {
-            date: '2024-08-28', // Wednesday is closed
-          },
-        ],
-      },
-    };
-
-    const pickEndDate = pickEndDateFunction({ settings, _, moment });
     const schedule = {
       addDays: 1,
       hour: 17,
@@ -113,7 +48,7 @@ describe('pickEndDate function', () => {
     const expectedDate = now
       .clone()
       .add(2, 'days') // Skips the closed Wednesday, goes to Thursday
-      .set({ hour: 0, minute: 0, second: 0 })
+      .set({ hour: schedule.hour, minute: 0, second: 0 })
       .utc()
       .format();
 
@@ -121,33 +56,6 @@ describe('pickEndDate function', () => {
   });
 
   test('Order calculated on a weekend', () => {
-    const settings = {
-      localization: {
-        locale: 'en-US',
-        hour12: true,
-        currency: 'USD',
-        phoneFormat: 'NATIONAL',
-        timezone: 'America/New_York',
-        defaultCountry: {
-          label: 'United States',
-          value: 'US',
-        },
-        dateFormat: 'default',
-      },
-      schedule: {
-        open: [
-          {
-            groupId: '666b542d5ed0ff34672d9c14',
-            days: [1, 2, 3, 4, 5], // Monday to Friday
-            startTime: '04:00',
-            endTime: '17:05',
-          },
-        ],
-        close: [],
-      },
-    };
-
-    const pickEndDate = pickEndDateFunction({ settings, _, moment });
     const schedule = {
       addDays: 1,
       hour: 17,
@@ -173,33 +81,6 @@ describe('pickEndDate function', () => {
   });
 
   test('Order time before cut-off hour', () => {
-    const settings = {
-      localization: {
-        locale: 'en-US',
-        hour12: true,
-        currency: 'USD',
-        phoneFormat: 'NATIONAL',
-        timezone: 'America/New_York',
-        defaultCountry: {
-          label: 'United States',
-          value: 'US',
-        },
-        dateFormat: 'default',
-      },
-      schedule: {
-        open: [
-          {
-            groupId: '666b542d5ed0ff34672d9c14',
-            days: [1, 2, 3, 4, 5], // Monday to Friday
-            startTime: '04:00',
-            endTime: '17:05',
-          },
-        ],
-        close: [],
-      },
-    };
-
-    const pickEndDate = pickEndDateFunction({ settings, _, moment });
     const schedule = {
       addDays: 0, // Same day
       hour: 17,
@@ -223,33 +104,6 @@ describe('pickEndDate function', () => {
     expect(result).toBe(expectedDate);
   });
   test('Order time after cut-off hour', () => {
-    const settings = {
-      localization: {
-        locale: 'en-US',
-        hour12: true,
-        currency: 'USD',
-        phoneFormat: 'NATIONAL',
-        timezone: 'America/New_York',
-        defaultCountry: {
-          label: 'United States',
-          value: 'US',
-        },
-        dateFormat: 'default',
-      },
-      schedule: {
-        open: [
-          {
-            groupId: '666b542d5ed0ff34672d9c14',
-            days: [1, 2, 3, 4, 5], // Monday to Friday
-            startTime: '04:00',
-            endTime: '17:05',
-          },
-        ],
-        close: [],
-      },
-    };
-
-    const pickEndDate = pickEndDateFunction({ settings, _, moment });
     const schedule = {
       hour: 17,
       minute: 0,

package/__TEST__/order/validateConditionsCalculate.test.js

@@ -250,6 +250,7 @@ describe('Conditions not met for the item', () => {
       itemId: '123',
       price: 100,
       modifiers: [],
+      total: 100,
     };
     order.items.push(item);
     const modifier = {
@@ -261,6 +262,8 @@ describe('Conditions not met for the item', () => {
             operand: '$in',
           },
         ],
+        _id: 'abcd',
+        modifierId: '123',
       },
       compute: {
         amount: 30,
@@ -270,10 +273,7 @@ describe('Conditions not met for the item', () => {
     };
     item.modifiers.push(modifier);
     const { calculate } = pricingService.order;
-    const paymentMethod = {
-      key: 'credit',
-    };
-    const calculatedOrder = calculate(order, { paymentMethod });
+    const calculatedOrder = calculate(order, { paymentType: 'credit' });
     expect(calculatedOrder).toHaveProperty('total', 100);
     expect(calculatedOrder).toHaveProperty('subTotal', 100);
   });
@@ -288,6 +288,7 @@ describe('Conditions not met for the item', () => {
       itemId: '123',
       price: 100,
       modifiers: [],
+      total: 100,
     };
     order.items.push(item);
     const modifier = {
@@ -305,22 +306,20 @@ describe('Conditions not met for the item', () => {
         type: 'fixed',
         action: 'subtract',
       },
+      _id: '123',
+      modifierId: 'abc',
     };
     item.modifiers.push(modifier);
     const { calculate } = pricingService.order;
-    // Calculate the order
-    const paymentMethod = {
-      key: 'cash',
-    };
-    const calculatedOrder = calculate(order, { paymentMethod });
+
+    const calculatedOrder = calculate(order, { paymentMethod: 'cash' });
     expect(calculatedOrder).toHaveProperty('total', 70);
     expect(calculatedOrder).toHaveProperty('subTotal', 100);
   });
   test('#9: paymentTypes condition is not met, item price remains the same', () => {
     const order = {
-      id: 'ord-123',
+      _id: 'ord-123',
       items: [],
-      modifiers: [],
     };
     const item = {
       quantity: 1,
@@ -344,53 +343,53 @@ describe('Conditions not met for the item', () => {
         type: 'fixed',
         action: 'subtract',
       },
+      _id: '111',
+      modifierId: 'ccc',
     };
     item.modifiers.push(modifier);
     const { calculate } = pricingService.order;
-    const paymentMethod = {
-      type: 'credit',
-    };
+
     // Calculate the order
-    const calculatedOrder = calculate(order, { paymentMethod });
+    const calculatedOrder = calculate(order, { paymentType: 'credit' });
     expect(calculatedOrder).toHaveProperty('total', 100);
     expect(calculatedOrder).toHaveProperty('subTotal', 100);
   });
   test('#10: paymentTypes condition is met, item total is updated', () => {
-    const order = {
-      id: 'ord-123',
-      items: [],
-      modifiers: [],
-    };
     const item = {
       quantity: 1,
       itemId: '123',
       price: 100,
-      modifiers: [],
-    };
-    order.items.push(item);
-    const modifier = {
-      conditions: {
-        rules: [
-          {
-            key: 'paymentTypes',
-            value: ['cash'],
-            operand: '$in',
+      modifiers: [
+        {
+          conditions: {
+            rules: [
+              {
+                key: 'paymentTypes',
+                value: ['cash'],
+                operand: '$in',
+              },
+            ],
           },
-        ],
-      },
-      compute: {
-        amount: 30,
-        type: 'fixed',
-        action: 'subtract',
-      },
+          compute: {
+            amount: 30,
+            type: 'fixed',
+            action: 'subtract',
+          },
+          _id: '123',
+          modifierId: 'bcd',
+        },
+      ],
+      total: 100,
     };
-    item.modifiers.push(modifier);
     const { calculate } = pricingService.order;
-    // Calculate the order
-    const paymentMethod = {
-      type: 'cash',
-    };
-    const calculatedOrder = calculate(order, { paymentMethod });
+
+    const calculatedOrder = calculate(
+      {
+        _id: 'ord-123',
+        items: [item],
+      },
+      { paymentType: 'cash' }
+    );
     expect(calculatedOrder).toHaveProperty('total', 70);
     expect(calculatedOrder).toHaveProperty('subTotal', 100);
   });