@darkpos/pricing 1.0.100 → 1.0.101

package/__TEST__/order/pickEndDate.test.js

@@ -239,4 +239,64 @@ describe('pickEndDate function', () => {
 
     expect(result).toBe('2025-05-14T15:00:00Z');
   });
+
+  test('pickEndDate - filters out schedules with departments', () => {
+    const schedulesWithDepartments = [
+      {
+        _id: 'schedule-with-departments',
+        dayOfWeek: [2],
+        recommended: 'auto_recommended',
+        addDays: 2,
+        cutDay: 1,
+        skipDays: [1],
+        readyHour: { hour: 18, minute: 0 },
+        cutHour: { hour: 16, minute: 0 },
+        departments: [{ _id: 'department-id' }],
+      },
+      {
+        _id: 'schedule-without-departments',
+        dayOfWeek: [2],
+        recommended: 'auto_recommended',
+        addDays: 1,
+        cutDay: 1,
+        skipDays: [1],
+        readyHour: { hour: 17, minute: 0 },
+        cutHour: { hour: 16, minute: 0 },
+      },
+    ];
+
+    const pricingService = usePricing(
+      getDefaultSettings(schedulesWithDepartments)
+    );
+    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+
+    const result = pricingService.store.pickEndDate();
+
+    expect(result).toBe('2025-05-14T21:00:00Z');
+  });
+
+  test('pickEndDate - uses provided schedules even with departments', () => {
+    const scheduleWithDepartments = [
+      {
+        _id: 'schedule-with-departments',
+        dayOfWeek: [2],
+        recommended: 'auto_recommended',
+        addDays: 2,
+        cutDay: 1,
+        skipDays: [1],
+        readyHour: { hour: 18, minute: 0 },
+        cutHour: { hour: 16, minute: 0 },
+        departments: [{ _id: 'department-id' }],
+      },
+    ];
+
+    const pricingService = usePricing(getDefaultSettings());
+    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+
+    const result = pricingService.store.pickEndDate(scheduleWithDepartments);
+
+    expect(result).toBe('2025-05-15T22:00:00Z');
+  });
 });

package/lib/order/splitByDepartments.js

@@ -1,4 +1,12 @@
-module.exports = ({ utils, _, actions, itemActions, modifierActions }) => {
+module.exports = ({
+  utils,
+  _,
+  actions,
+  itemActions,
+  modifierActions,
+  settings,
+  storeActions,
+}) => {
   const { helpers } = utils;
 
   const isSplitByPieces = splitUnit => splitUnit === 'pieces';
@@ -26,16 +34,45 @@ module.exports = ({ utils, _, actions, itemActions, modifierActions }) => {
       return { ...order, items };
     });
 
-  return function splitByDepartments({ parentOrder, newItems }) {
+  const getDepartmentSchedules = department => {
+    if (!department) return null;
+    const allSchedules = _.get(settings, 'order.schedules', []);
+    return allSchedules.filter(item =>
+      item.departments.some(dep => dep._id === department.modifierId)
+    );
+  };
+
+  return function splitByDepartments({
+    parentOrder: parentOrderParam,
+    newItems,
+  }) {
     const itemsByDepartments = _.groupBy(newItems, getDepartmentName);
     const itemGroups = Object.values(itemsByDepartments);
     let splitOrders = [];
+    const defaultEndDate = storeActions.pickEndDate();
+    const isDefaultEndDate =
+      !parentOrderParam.end ||
+      !parentOrderParam.end.requestDate ||
+      utils.date.isEqual(defaultEndDate, parentOrderParam.end.requestDate);
 
     itemGroups.forEach(items => {
       // Assuming there is one department in the item
       const department = itemActions.getDepartmentModifiers(items[0])[0];
       const departmentName = getDepartmentName(items[0]);
       const maxItems = modifierActions.getDepartmentMaxItems(department);
+      const departmentSchedules = getDepartmentSchedules(department);
+      let parentOrder = { ...parentOrderParam };
+
+      if (
+        departmentSchedules &&
+        departmentSchedules.length &&
+        isDefaultEndDate
+      ) {
+        parentOrder = actions.changeEndDate({
+          date: storeActions.pickEndDate(departmentSchedules),
+          order: parentOrder,
+        });
+      }
 
       const autoSplit = _.get(
         department || {},

package/lib/store/pickEndDate.js

@@ -1,5 +1,7 @@
 module.exports = ({ settings, _, moment }) => {
-  const timezone = _.get(settings, 'localization.timezone', 'America/New_York');
+  const timezone =
+    _.get(settings, 'localization.timezone', 'America/New_York') ||
+    'America/New_York';
 
   const getSchedule = (schedules, isoWeekday) => {
     const todayTZ = moment().tz(timezone);
@@ -7,7 +9,9 @@ module.exports = ({ settings, _, moment }) => {
     const _schedules =
       schedules && schedules.length
         ? schedules
-        : _.get(settings, 'order.schedules', []);
+        : _.get(settings, 'order.schedules', []).filter(
+            item => !item.departments || !item.departments.length
+          );
 
     if (!_schedules.length) {
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.100",
+  "version": "1.0.101",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -54,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "dbe4e7f639282d1eb04927708dac5195275fe5e4"
+  "gitHead": "aad940d770d15b6072fd45e300302002bfc8fc08"
 }