@darkpos/pricing 1.0.90 → 1.0.92

package/__TEST__/order/order.test.js

@@ -1960,7 +1960,7 @@ describe('Order actions', () => {
     expect(newOrder).toHaveProperty('total', 710.36);
     expect(newOrder).toHaveProperty('subTotal', 775.6);
     expect(newOrder).toHaveProperty('subTotals', {
-      percentage: -116.34,
+      percentage: -116.344,
       tax: 51.09265,
     });
     expect(newOrder.items[0]).toHaveProperty('total', 65.85);
@@ -1971,7 +1971,7 @@ describe('Order actions', () => {
     expect(newOrder.items[5]).toHaveProperty('total', 109.91);
     expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
       'amount',
-      -10.785
+      -10.789
     );
     expect(newOrder.items[0].modifiers[1]._computed).toHaveProperty(
       'amount',
@@ -2065,17 +2065,17 @@ describe('Order actions', () => {
 
     const newOrder = pricingService.order.calculate(order);
 
-    expect(newOrder).toHaveProperty('total', 137.93);
+    expect(newOrder).toHaveProperty('total', 137.92);
     expect(newOrder).toHaveProperty('subTotal', 128);
     expect(newOrder).toHaveProperty('subTotals', {
-      tax: 9.92,
+      tax: 9.916,
     });
-    expect(newOrder.items[0]).toHaveProperty('total', 40.95);
+    expect(newOrder.items[0]).toHaveProperty('total', 40.94);
     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',
-      2.945
+      2.941
     );
 
     expect(newOrder.items[1].modifiers[0]._computed).toHaveProperty(
@@ -3965,4 +3965,58 @@ describe('Order actions', () => {
     expect(newOrder.items[0].total).toBe(25);
     expect(newOrder.items[0].status).toMatchObject({});
   });
+
+  test('Calculate order with 7% tax, expect correct decimals and rounding', () => {
+    const taxModifier = {
+      compute: {
+        amount: 7,
+        type: 'percentage',
+        action: 'add',
+      },
+      name: 'tax 7%',
+      type: 'tax',
+    };
+
+    const orderItem1 = {
+      price: 4.5,
+      quantity: 1,
+      modifiers: [taxModifier],
+    };
+    const orderItem2 = {
+      price: 4.25,
+      quantity: 1,
+      modifiers: [taxModifier],
+    };
+    const orderItem3 = {
+      price: 6.95,
+      quantity: 1,
+      modifiers: [taxModifier],
+    };
+    const order = { items: [orderItem1, orderItem2, orderItem3] };
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 16.8);
+    expect(newOrder).toHaveProperty('subTotal', 15.7);
+    expect(newOrder).toHaveProperty('subTotals', {
+      tax: 1.095,
+    });
+
+    expect(newOrder.items[0].modifiers[0]._computed.amount).toEqual(0.311);
+    expect(newOrder.items[0].modifiers[0]._computed.description).toEqual(
+      'tax 7% ($0.31)'
+    );
+    expect(newOrder.items[0].total).toEqual(4.81);
+
+    expect(newOrder.items[1].modifiers[0]._computed.amount).toEqual(0.2975);
+    expect(newOrder.items[1].modifiers[0]._computed.description).toEqual(
+      'tax 7% ($0.30)'
+    );
+    expect(newOrder.items[1].total).toEqual(4.55);
+
+    expect(newOrder.items[2].modifiers[0]._computed.amount).toEqual(0.4865);
+    expect(newOrder.items[2].modifiers[0]._computed.description).toEqual(
+      'tax 7% ($0.49)'
+    );
+    expect(newOrder.items[2].total).toEqual(7.44);
+  });
 });

package/__TEST__/order/pickEndDate.test.js

@@ -1,7 +1,7 @@
 const moment = require('moment-timezone');
 const usePricing = require('../../lib/index');
 
-const pricingService = usePricing({
+const getDefaultSettings = schedules => ({
   store: {
     _settings: {
       schedule: {
@@ -11,6 +11,20 @@ const pricingService = usePricing({
           },
         ],
       },
+      order: {
+        schedules: schedules || [
+          {
+            _id: '682373ef8256034ae1f2c195',
+            dayOfWeek: [2],
+            recommended: 'auto_recommended',
+            addDays: 1,
+            cutDay: 1,
+            skipDays: undefined,
+            readyHour: null,
+            cutHour: null,
+          },
+        ],
+      },
     },
   },
 });
@@ -24,64 +38,68 @@ describe('pickEndDate function', () => {
       readyHour: { hour: 17, minute: 0 },
       cutDay: 2,
     };
+    const pricingServiceTest = usePricing(getDefaultSettings([schedule]));
 
     const now = moment('2024-08-25T15:00:00Z').tz('America/New_York');
     jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
 
-    const result = pricingService.store.pickEndDate(schedule);
+    const result = pricingServiceTest.store.pickEndDate();
 
-    expect(result).toBe('2024-08-26T21:00:00Z'); // 2024-08-27 17:00:00 EDT
+    expect(result).toBe('2024-08-26T21:00:00Z');
   });
 
   test('Order falls on a closed day', () => {
     const schedule = {
       addDays: 1,
       readyHour: { hour: 14, minute: 0 },
-      skipDays: [7], // Skip Sunday
+      skipDays: [7],
       cutHour: { hour: 16, minute: 0 },
       cutDay: 2,
     };
 
-    const now = moment('2024-08-27T15:00:00Z').tz('America/New_York'); // Tuesday
+    const now = moment('2024-08-27T15:00:00Z').tz('America/New_York');
 
     jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
-    const result = pricingService.store.pickEndDate(schedule);
+    const pricingServiceTest = usePricing(getDefaultSettings([schedule]));
+    const result = pricingServiceTest.store.pickEndDate();
 
-    expect(result).toBe('2024-08-28T18:00:00Z'); // 2024-08-28 14:00:00 EDT
+    expect(result).toBe('2024-08-28T18:00:00Z');
   });
 
   test('Get endDate if today is friday and Saturday and Sunday are skip days', () => {
     const schedule = {
       addDays: 1,
       readyHour: { hour: 17, minute: 0 },
-      skipDays: [6, 7], // Skip Saturday and Sunday
+      skipDays: [6, 7],
       cutHour: { hour: 16, minute: 0 },
       cutDay: 5,
     };
 
-    const now = moment('2024-08-23T15:00:00Z').tz('America/New_York'); // Friday
+    const now = moment('2024-08-23T15:00:00Z').tz('America/New_York');
 
     jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
-    const result = pricingService.store.pickEndDate(schedule);
+    const pricingServiceTest = usePricing(getDefaultSettings([schedule]));
+    const result = pricingServiceTest.store.pickEndDate();
 
-    expect(result).toBe('2024-08-26T21:00:00Z'); // 2024-08-26 17:00:00 EDT
+    expect(result).toBe('2024-08-26T21:00:00Z');
   });
 
   test('Order time before cut-off hour', () => {
     const schedule = {
-      addDays: 0, // Same day
+      addDays: 0,
       readyHour: { hour: 17, minute: 0 },
       skipDays: [],
-      cutHour: { hour: 16, minute: 0 }, // Cut-off at 4 PM
+      cutHour: { hour: 16, minute: 0 },
       cutDay: 5,
     };
 
-    const now = moment('2024-08-25T15:00:00Z').tz('America/New_York'); // Friday, before cut-off
+    const now = moment('2024-08-25T15:00:00Z').tz('America/New_York');
 
     jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
-    const result = pricingService.store.pickEndDate(schedule);
+    const pricingServiceTest = usePricing(getDefaultSettings([schedule]));
+    const result = pricingServiceTest.store.pickEndDate();
 
-    expect(result).toBe('2024-08-25T21:00:00Z'); // 2024-08-25 17:00:00 EDT
+    expect(result).toBe('2024-08-25T21:00:00Z');
   });
 
   test('Order time after cut-off hour', () => {
@@ -97,12 +115,13 @@ describe('pickEndDate function', () => {
       recommended: 'nothing_recommended',
     };
 
-    const now = moment().tz('America/New_York'); // Friday, after cut-off
+    const now = moment().tz('America/New_York');
 
     jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
-    const result = pricingService.store.pickEndDate(schedule);
+    const pricingServiceTest = usePricing(getDefaultSettings([schedule]));
+    const result = pricingServiceTest.store.pickEndDate();
 
-    expect(result).toBe('2024-08-31T21:00:00Z'); // 2024-08-31 17:00:00 EDT
+    expect(result).toBe('2024-08-31T21:00:00Z');
   });
 
   test('Get EndDate, there are skip dates in between', () => {
@@ -117,9 +136,10 @@ describe('pickEndDate function', () => {
     const now = moment('2024-08-25T15:00:00Z').tz('America/New_York');
     jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
 
-    const result = pricingService.store.pickEndDate(schedule);
+    const pricingServiceTest = usePricing(getDefaultSettings([schedule]));
+    const result = pricingServiceTest.store.pickEndDate();
 
-    expect(result).toBe('2024-08-26T21:00:00Z'); // 2024-08-26 17:00:00 EDT
+    expect(result).toBe('2024-08-26T21:00:00Z');
   });
 
   test('Get EndDate, Now date is an skip day', () => {
@@ -134,8 +154,89 @@ describe('pickEndDate function', () => {
     const now = moment('2024-09-01T15:00:00Z').tz('America/New_York');
     jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
 
-    const result = pricingService.store.pickEndDate(schedule);
+    const pricingServiceTest = usePricing(getDefaultSettings([schedule]));
+    const result = pricingServiceTest.store.pickEndDate();
+
+    expect(result).toBe('2024-09-05T00:00:00Z');
+  });
+
+  test('Get EndDate, undefined skipdays', () => {
+    const schedule = {
+      addDays: 1,
+      readyHour: { hour: 20, minute: 0 },
+      cutHour: { hour: 16, minute: 0 },
+      cutDay: 1,
+    };
+
+    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+
+    const pricingServiceTest = usePricing(getDefaultSettings([schedule]));
+    const result = pricingServiceTest.store.pickEndDate();
+
+    expect(result).toBe('2025-05-15T00:00:00Z');
+  });
+
+  test('pickEndDate, skipDays undefined', () => {
+    const pricingServiceSkipDays = usePricing(getDefaultSettings());
+    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+
+    const result = pricingServiceSkipDays.store.pickEndDate();
+    expect(result).toBe('2025-05-14T15:00:00Z');
+  });
+
+  test('pickEndDate - getRecommendedEndDate, skipDays with dayOfWeek undefined', () => {
+    const pricingServiceSkipDays2 = usePricing({
+      store: {
+        _settings: {
+          order: {
+            endDate: {
+              readySchedule: [
+                {
+                  _id: '682373ef8256034ae1f2c195',
+                  dayOfWeek: null,
+                  recommended: 'auto_recommended',
+                  addDays: 1,
+                  cutDay: 1,
+                  skipDays: [1],
+                  readyHour: null,
+                  cutHour: null,
+                },
+              ],
+            },
+          },
+        },
+      },
+    });
+    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+
+    const result = pricingServiceSkipDays2.store.pickEndDate();
+
+    expect(result).toBe('2025-05-13T15:00:00Z');
+  });
+
+  test('pickEndDate - getRecommendedEndDate, skipDays with one day', () => {
+    const pricingServiceSkipDays3 = usePricing(
+      getDefaultSettings([
+        {
+          _id: '682373ef8256034ae1f2c195',
+          dayOfWeek: [2],
+          recommended: 'auto_recommended',
+          addDays: 1,
+          cutDay: 1,
+          skipDays: [1],
+          readyHour: null,
+          cutHour: null,
+        },
+      ])
+    );
+    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+
+    const result = pricingServiceSkipDays3.store.pickEndDate();
 
-    expect(result).toBe('2024-09-05T00:00:00Z'); // 2024-09-04 20:00:00 EDT
+    expect(result).toBe('2025-05-14T15:00:00Z');
   });
 });

package/lib/item/getTotalsDifference.js

@@ -10,5 +10,11 @@ module.exports = ({ utils }) =>
       }),
       { total: 0, subTotalsTotal: 0 }
     );
-    return utils.math.sub(subTotalsTotal, total);
+    const difference = utils.math.sub(subTotalsTotal, total);
+
+    if (difference < -0.005) return -0.004;
+    if (difference === -0.005) return 0.005;
+    if (difference > 0.005) return 0.004;
+    if (difference === 0.005) return -0.005;
+    return 0;
   };

package/lib/order/calculate.js

@@ -114,16 +114,11 @@ module.exports = ({
         );
       }
     };
-
     if (calculatedItems.length > 0) {
-      let difference = itemActions.getTotalsDifference({
+      const difference = itemActions.getTotalsDifference({
         items: calculatedItems,
       });
 
-      if (difference < 0) {
-        difference = difference < -0.005 ? 0 : utils.math.abs(difference);
-      }
-
       const itemIndex = calculatedItems.findIndex(
         item =>
           !itemActions.isFullyPaid(item) &&
@@ -134,7 +129,7 @@ module.exports = ({
           )
       );
 
-      if (itemIndex >= 0 && difference >= 0.005) {
+      if (itemIndex >= 0 && difference !== 0) {
         calculatedItems[itemIndex] = itemActions.patchItem({
           item: calculatedItems[itemIndex],
           difference,

package/lib/order/index.js

@@ -69,7 +69,6 @@ const addModifierToAllItems = require('./addModifierToAllItems');
 const getItemIndex = require('./getItemIndex');
 const getRelatedItems = require('./getRelatedItems');
 const getItemByItemId = require('./getItemByItemId');
-const getScheduleByCustomer = require('./getScheduleByCustomer');
 const getAppliedCredit = require('./getAppliedCredit');
 const addCreditModifier = require('./addCreditModifier');
 const adjustCreditModifiersDifference = require('./adjustCreditModifiersDifference');
@@ -174,7 +173,6 @@ const orderActions = (deps = {}) => {
     addModifierToAllItems: addModifierToAllItems(innerDeps),
     getItemIndex: getItemIndex(innerDeps),
     getRelatedItems: getRelatedItems(innerDeps),
-    getScheduleByCustomer: getScheduleByCustomer(innerDeps),
     getAppliedCredit: getAppliedCredit(innerDeps),
     addCreditModifier: addCreditModifier(innerDeps),
     adjustCreditModifiersDifference: adjustCreditModifiersDifference(innerDeps),

package/lib/store/getScheduleByCustomer.js

@@ -0,0 +1,25 @@
+module.exports = ({ _, settings }) => {
+  const schedules = _.get(settings, 'order.schedules', []);
+
+  const filterCustomerTags = customer => {
+    const { tags } = customer || {};
+    if (!tags || !tags.length) return [];
+    return tags.filter(each => !['all', 'default'].includes(each));
+  };
+
+  return function getScheduleByCustomer(customer) {
+    const tags = filterCustomerTags(customer);
+    if (!tags || !tags.length) return schedules;
+
+    const scheduleTags = [
+      ...new Set(schedules.reduce((a, c) => a.concat(...(c.tags || [])), [])),
+    ];
+    if (!scheduleTags || !scheduleTags.length) return schedules;
+
+    const filteredSchedules = schedules.filter(schedule =>
+      tags.find(tag => (schedule.tags || []).includes(tag))
+    );
+    if (!filteredSchedules.length) return schedules;
+    return filteredSchedules;
+  };
+};

package/lib/store/index.js

@@ -1,7 +1,8 @@
 //
-const pickEndDate = require('./pickEndDate');
-const getRecommendedEndDate = require('./getRecommendedEndDate');
+const getScheduleByCustomer = require('./getScheduleByCustomer');
 const isNeareastMultiple = require('./isNeareastMultiple');
+const pickEndDate = require('./pickEndDate');
+const pickEndDateByCustomer = require('./pickEndDateByCustomer');
 
 const storeActions = (deps = {}) => {
   const actions = {};
@@ -12,9 +13,10 @@ const storeActions = (deps = {}) => {
   };
 
   const freezedActions = Object.freeze({
-    pickEndDate: pickEndDate(innerDeps),
-    getRecommendedEndDate: getRecommendedEndDate(innerDeps),
+    getScheduleByCustomer: getScheduleByCustomer(innerDeps),
     isNeareastMultiple: isNeareastMultiple(innerDeps),
+    pickEndDate: pickEndDate(innerDeps),
+    pickEndDateByCustomer: pickEndDateByCustomer(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/store/pickEndDate.js

@@ -1,6 +1,34 @@
 module.exports = ({ settings, _, moment }) => {
   const timezone = _.get(settings, 'localization.timezone', 'America/New_York');
 
+  const getSchedule = (schedules, isoWeekday) => {
+    const todayTZ = moment().tz(timezone);
+    const day = isoWeekday || todayTZ.isoWeekday(); // monday 1 - sunday 7
+    const _schedules =
+      schedules && schedules.length
+        ? schedules
+        : _.get(settings, 'order.schedules', []);
+
+    if (!_schedules.length) {
+      return {
+        todayTZ,
+        skipDays: [],
+        cutDay: 0,
+      };
+    }
+
+    const schedule = _schedules.find(item => {
+      const { dayOfWeek } = item || {};
+      if (!dayOfWeek || !dayOfWeek.length) return true;
+      return dayOfWeek.includes(day);
+    });
+
+    return {
+      ...schedule,
+      todayTZ,
+    };
+  };
+
   const getClosedDays = () => {
     const schedule = _.get(settings, 'schedule', {});
     const { close = [] } = schedule;
@@ -10,16 +38,16 @@ module.exports = ({ settings, _, moment }) => {
 
   const MAX_ADD_DAYS = 365;
 
-  return function pickEndDate(schedule = {}) {
+  return function pickEndDate(schedules, isoWeekday) {
     const {
       addDays: addDaysParam,
       readyHour,
-      skipDays = [],
       cutHour,
-      cutDay = 0,
-    } = schedule;
+      cutDay,
+      skipDays,
+      todayTZ,
+    } = getSchedule(schedules, isoWeekday);
 
-    const todayTZ = moment().tz(timezone);
     let endDateTZ = todayTZ.clone();
     const closedDays = getClosedDays();
     const todayHours = todayTZ.get('hours');
@@ -45,8 +73,9 @@ module.exports = ({ settings, _, moment }) => {
     endDateTZ.set('second', 0);
 
     const isSkipDay = endDateIsoWeekDay => {
-      if (skipDays.length >= 7) return false;
-      return skipDays.includes(endDateIsoWeekDay);
+      if (skipDays && skipDays.length >= 7) return false;
+
+      return skipDays && skipDays.includes(endDateIsoWeekDay);
     };
 
     const isClosedDay = endDate =>

package/lib/store/pickEndDateByCustomer.js

@@ -0,0 +1,5 @@
+module.exports = ({ actions }) =>
+  function pickEndDateByCustomer(customer, isoWeekday) {
+    const schedules = actions.getScheduleByCustomer(customer);
+    return actions.pickEndDate(schedules, isoWeekday);
+  };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.90",
+  "version": "1.0.92",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -51,5 +51,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "9c351c72bca0563fb454c0cb51d50dcaf49ba37d"
+  "gitHead": "ae4955dc540555ef6c2e4b8c758e9d8df4d0a03c"
 }

package/lib/order/getScheduleByCustomer.js

@@ -1,19 +0,0 @@
-module.exports = ({ _, settings }) => {
-  const orderSettings = _.get(settings, 'order');
-
-  return function getScheduleByCustomer(customer = {}) {
-    const { tags } = customer;
-    const { default: defaultSchedule, ...schedules } =
-      orderSettings.endDate || {};
-    if (!tags || !tags.length) return defaultSchedule;
-
-    const scheduleTags = Object.keys(schedules);
-    if (!scheduleTags || !scheduleTags.length) return defaultSchedule;
-
-    const tag = tags
-      .filter(each => each !== 'default' && each !== 'all')
-      .find(each => scheduleTags.includes(each));
-    if (!tag) return defaultSchedule;
-    return schedules[tag];
-  };
-};

package/lib/store/getRecommendedEndDate.js

@@ -1,22 +0,0 @@
-module.exports = ({ actions, settings }) =>
-  function getRecommendedEndDate() {
-    const readySchedule =
-      settings.order &&
-      settings.order.endDate &&
-      settings.order.endDate.readySchedule;
-
-    if (readySchedule) {
-      const dayOfWeek = new Date().getDay();
-      const day = dayOfWeek || 7;
-      const schedule = settings.order.endDate.readySchedule.find(item =>
-        item.dayOfWeek.includes(day)
-      );
-      return schedule
-        ? actions.pickEndDate({
-            ...schedule,
-          })
-        : null;
-    }
-
-    return null;
-  };