@darkpos/pricing 1.0.27 → 1.0.29

package/__TEST__/order/pickEndDate.test.js

@@ -0,0 +1,284 @@
+const moment = require('moment-timezone');
+const _ = require('lodash');
+const pickEndDateFunction = require('../../lib/order/pickEndDate');
+
+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,
+      minute: 0,
+      skipDays: [7],
+      cutHour: { hour: 16, minute: 0 },
+      cutDay: 2,
+    };
+
+    const now = moment('2024-08-25T15:00:00Z').tz('America/New_York');
+
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+    const result = pickEndDate(schedule);
+
+    const expectedDate = now
+      .clone()
+      .add(2, 'days')
+      .set({ hour: 17, minute: 0, second: 0 })
+      .utc()
+      .format();
+
+    expect(result).toBe(expectedDate);
+  });
+
+  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,
+      minute: 0,
+      skipDays: [7], // Skip Sunday
+      cutHour: { hour: 16, minute: 0 },
+      cutDay: 2,
+    };
+
+    const now = moment('2024-08-27T15:00:00Z').tz('America/New_York'); // Tuesday
+
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+    const result = pickEndDate(schedule);
+
+    const expectedDate = now
+      .clone()
+      .add(2, 'days') // Skips the closed Wednesday, goes to Thursday
+      .set({ hour: 17, minute: 0, second: 0 })
+      .utc()
+      .format();
+
+    expect(result).toBe(expectedDate);
+  });
+
+  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,
+      minute: 0,
+      skipDays: [6, 7], // Skip Saturday and Sunday
+      cutHour: { hour: 16, minute: 0 },
+      cutDay: 5,
+    };
+
+    const now = moment('2024-08-23T15:00:00Z').tz('America/New_York'); // Friday
+
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+    const result = pickEndDate(schedule);
+
+    const expectedDate = now
+      .clone()
+      .add(3, 'days') // Skips weekend, goes to Monday
+      .set({ hour: 17, minute: 0, second: 0 })
+      .utc()
+      .format();
+
+    expect(result).toBe(expectedDate);
+  });
+
+  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,
+      minute: 0,
+      skipDays: [],
+      cutHour: { hour: 16, minute: 0 }, // Cut-off at 4 PM
+      cutDay: 5,
+    };
+
+    const now = moment('2024-08-25T15:00:00Z').tz('America/New_York'); // Friday, before cut-off
+
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+    const result = pickEndDate(schedule);
+
+    const expectedDate = now
+      .clone()
+      .set({ hour: 17, minute: 0, second: 0 })
+      .utc()
+      .format();
+
+    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,
+      cutDay: 5,
+      skipDays: [],
+      cutHour: {
+        hour: 0,
+        minute: 0,
+      },
+      time: {
+        hour: 16,
+        minute: 0,
+      },
+      addDays: 1,
+      recommended: 'nothing_recommended',
+    };
+
+    const now = moment().tz('America/New_York'); // Friday, after cut-off
+
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+    const result = pickEndDate(schedule);
+
+    const expectedDate = now
+      .clone()
+      .add(6, 'days') // Skips weekend, goes to Monday
+      .set({ hour: 17, minute: 0, second: 0 })
+      .utc()
+      .format();
+
+    expect(result).toBe(expectedDate);
+  });
+});

package/lib/order/pickEndDate.js

@@ -7,13 +7,11 @@ module.exports = ({ settings, _, moment }) => {
 
     if (!Array.isArray(close)) return [];
     return close.map(closedDate => ({
-      isoWeekDay: moment(closedDate.date).tz(timezone).isoWeekday(),
-      date: moment(closedDate.date).tz(timezone)
+      date: moment(closedDate.date), // the date is saved with the user timezone, no need to convert it back here (ex: date: '2024-08-27' would become date:'2024-08-26 23:00 -4:00')
     }));
-  }
+  };
 
   return function pickEndDate(schedule = {}) {
-
     const {
       addDays = 1,
       hour,
@@ -29,24 +27,31 @@ module.exports = ({ settings, _, moment }) => {
     const closedDays = getClosedDays();
 
     if (
-      cutHour &&
-      todayTZ.isAfter(moment(cutHour, 'hh:mm:ss').tz(timezone))
+      (cutHour && todayTZ.get('hours') > cutHour.hour) ||
+      (todayTZ.get('hours') >= cutHour.hour &&
+        todayTZ.get('minutes') > cutHour.minute)
     ) {
-      endDateTZ = endDateTZ.add(cutDay, 'days')
+      endDateTZ = endDateTZ.add(cutDay, 'days');
     }
 
     let addDaysCounter = 0;
-
-    while (addDaysCounter < addDays) {
+    // adding the skip days to the loop
+    const loop = addDays + skipDays.length;
+    while (addDaysCounter < loop) {
       endDateTZ = endDateTZ.add(1, 'days');
-      const endDateISOWeekday = endDateTZ.isoWeekday() === 7 ? 0 : endDateTZ.isoWeekday();
-
-      if (!skipDays.includes(endDateISOWeekday) && !closedDays.some(closedDay => {
-        return closedDay.date.isSame(endDateTZ, 'day');
-      })) {
+      const endDateISOWeekday = endDateTZ.isoWeekday();
+      // does the current endDateISOWeekday match with any skip day?
+      // is endDateISOWeekday a sunday?
+      const shouldSkip =
+        skipDays.includes(endDateISOWeekday) || endDateISOWeekday === 7;
+      // if addDaysCounter is greater than loop, than we shouldn't add more days
+      // day condition stays working until addDaysCounter is greater than loop
+      if (
+        !shouldSkip ||
+        !closedDays.some(closedDay => closedDay.date.isSame(endDateTZ, 'day'))
+      ) {
         addDaysCounter++;
-      } 
-
+      }
     }
 
     if (hour !== undefined) endDateTZ.set('hour', hour);
@@ -55,4 +60,4 @@ module.exports = ({ settings, _, moment }) => {
 
     return moment.utc(endDateTZ).format();
   };
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -36,5 +36,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "575378174e6efda3e4bffa65d1226e55eb09725e"
+  "gitHead": "2b7284fc85592dc13f7026d605c62aaa00e18459"
 }