@darkpos/pricing 1.0.54 → 1.0.56

package/__TEST__/modifier.test.js

@@ -24,4 +24,116 @@ describe('Modifier actions', () => {
       })
     ).toBe(false);
   });
+
+  test('CU-86dve27tq Should not allow adding a modifier more than once to an item if isQuantityMultiplier={false} QTY={2}', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+    };
+    const modifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        action: 'subtract',
+        type: 'fixed',
+      },
+    };
+    order.items.push({
+      quantity: 2,
+      itemId: '123',
+      price: 100,
+      modifiers: [],
+    });
+
+    const conditionsBag = [];
+
+    const updatedOrder = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+      onConditionsNotMet: bag => {
+        bag.forEach(condition => {
+          conditionsBag.push(condition);
+        });
+      },
+    });
+
+    let error = '';
+    const updatedOrder2 = pricingService.order.addItemModifier({
+      order: { ...updatedOrder },
+      modifier,
+      itemIndex: 0,
+      onConditionsNotMet: bag => {
+        bag.forEach(condition => {
+          conditionsBag.push(condition);
+        });
+      },
+      onError: errorMessage => {
+        error = errorMessage;
+      },
+    });
+
+    expect(conditionsBag).toEqual([]);
+    expect(error).toEqual('modifier.has.reached.the.maximum.amount.of.applies');
+    expect(updatedOrder2).toEqual(updatedOrder);
+  });
+
+  test('CU-86dve27tq Should not allow adding a modifier more than once to an item if isQuantityMultiplier={false} QTY={1}', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+    };
+    const modifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        action: 'subtract',
+        type: 'fixed',
+      },
+    };
+    order.items.push({
+      quantity: 1,
+      itemId: '123',
+      price: 100,
+      modifiers: [],
+      properties: {
+        basePrice: 100,
+      },
+    });
+
+    const conditionsBag = [];
+
+    const updatedOrder = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+      onConditionsNotMet: bag => {
+        bag.forEach(condition => {
+          conditionsBag.push(condition);
+        });
+      },
+    });
+
+    let error = '';
+    const updatedOrder2 = pricingService.order.addItemModifier({
+      order: { ...updatedOrder },
+      modifier,
+      itemIndex: 0,
+      onConditionsNotMet: bag => {
+        bag.forEach(condition => {
+          conditionsBag.push(condition);
+        });
+      },
+      onError: errorMessage => {
+        error = errorMessage;
+      },
+      cache: { items: [], modifiers: [] },
+    });
+
+    expect(conditionsBag).toEqual([]);
+    expect(error).toEqual('');
+    expect(updatedOrder2).toEqual(order);
+  });
 });

package/__TEST__/order/pickEndDate.test.js

@@ -1,11 +1,22 @@
 const moment = require('moment-timezone');
 const usePricing = require('../../lib/index');
 
-const pricingService = usePricing();
-const { pickEndDate } = pricingService.store;
+const pricingService = usePricing({
+  store: {
+    _settings: {
+      schedule: {
+        close: [
+          {
+            date: '2024-09-03',
+          },
+        ],
+      },
+    },
+  },
+});
 
 describe('pickEndDate function', () => {
-  test('Get calculated Order, one item', () => {
+  test('Get EndDate, today is an Skip date', () => {
     const schedule = {
       addDays: 1,
       hour: 17,
@@ -16,24 +27,17 @@ describe('pickEndDate function', () => {
     };
 
     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: schedule.hour, minute: schedule.minute, second: 0 })
-      .utc()
-      .format();
+    const result = pricingService.store.pickEndDate(schedule);
 
-    expect(result).toBe(expectedDate);
+    expect(result).toBe('2024-08-27T21:00:00Z'); // 2024-08-27 17:00:00 EDT
   });
 
   test('Order falls on a closed day', () => {
     const schedule = {
       addDays: 1,
-      hour: 17,
+      hour: 14,
       minute: 0,
       skipDays: [7], // Skip Sunday
       cutHour: { hour: 16, minute: 0 },
@@ -43,19 +47,12 @@ describe('pickEndDate function', () => {
     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: schedule.hour, minute: 0, second: 0 })
-      .utc()
-      .format();
+    const result = pricingService.store.pickEndDate(schedule);
 
-    expect(result).toBe(expectedDate);
+    expect(result).toBe('2024-08-28T18:00:00Z'); // 2024-08-28 14:00:00 EDT
   });
 
-  test('Order calculated on a weekend', () => {
+  test('Get endDate if today is friday and Saturday and Sunday are skip days', () => {
     const schedule = {
       addDays: 1,
       hour: 17,
@@ -68,16 +65,9 @@ describe('pickEndDate function', () => {
     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 result = pricingService.store.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);
+    expect(result).toBe('2024-08-26T21:00:00Z'); // 2024-08-26 17:00:00 EDT
   });
 
   test('Order time before cut-off hour', () => {
@@ -93,16 +83,11 @@ describe('pickEndDate function', () => {
     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();
+    const result = pricingService.store.pickEndDate(schedule);
 
-    expect(result).toBe(expectedDate);
+    expect(result).toBe('2024-08-25T21:00:00Z'); // 2024-08-25 17:00:00 EDT
   });
+
   test('Order time after cut-off hour', () => {
     const schedule = {
       hour: 17,
@@ -124,15 +109,44 @@ describe('pickEndDate function', () => {
     const now = moment().tz('America/New_York'); // Friday, after cut-off
 
     jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
-    const result = pickEndDate(schedule);
+    const result = pricingService.store.pickEndDate(schedule);
+
+    expect(result).toBe('2024-08-31T21:00:00Z'); // 2024-08-31 17:00:00 EDT
+  });
+
+  test('Get EndDate, there are skip dates in between', () => {
+    const schedule = {
+      addDays: 1,
+      hour: 17,
+      minute: 0,
+      skipDays: [7, 0],
+      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 = pricingService.store.pickEndDate(schedule);
+
+    expect(result).toBe('2024-08-27T21:00:00Z'); // 2024-08-27 17:00:00 EDT
+  });
+
+  test('Get EndDate, there are skip dates in between and endDate falls in a closed date', () => {
+    const schedule = {
+      addDays: 1,
+      hour: 20,
+      minute: 0,
+      skipDays: [1, 7],
+      cutHour: { hour: 16, minute: 0 },
+      cutDay: 2,
+    };
+
+    const now = moment('2024-09-01T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
 
-    const expectedDate = now
-      .clone()
-      .add(6, 'days') // Skips weekend, goes to Monday
-      .set({ hour: 17, minute: 0, second: 0 })
-      .utc()
-      .format();
+    const result = pricingService.store.pickEndDate(schedule);
 
-    expect(result).toBe(expectedDate);
+    expect(result).toBe('2024-09-06T00:00:00Z'); // 2024-09-05 20:00:00 EDT
   });
 });

package/lib/item/calculate.js

@@ -29,7 +29,8 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
     subTotals._simple = math.mul(price, quantity);
 
     const modifiers = [];
-    const { modifiers: itemModifiers = [] } = item;
+    const { modifiers: itemModifiers = [] } =
+      actions.removeModifiersByQuantity(item);
 
     const validatedModifiers = itemModifiers.map(each =>
       modifierActions.validate(each, {

package/lib/item/index.js

@@ -46,6 +46,7 @@ const getTotalsDifference = require('./getTotalsDifference');
 const getTotalNeareastDifference = require('./getTotalNeareastDifference');
 const getNoteTags = require('./getNoteTags');
 const getBasePrice = require('./getBasePrice');
+const removeModifiersByQuantity = require('./removeModifiersByQuantity');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -105,6 +106,7 @@ const itemActions = (deps = {}) => {
     getTotalNeareastDifference: getTotalNeareastDifference(innerDeps),
     getNoteTags: getNoteTags(innerDeps),
     getBasePrice: getBasePrice(innerDeps),
+    removeModifiersByQuantity: removeModifiersByQuantity(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/item/removeModifiersByQuantity.js

@@ -0,0 +1,30 @@
+module.exports = ({ modifierActions }) =>
+  function removeModifiersByQuantity(item) {
+    if (!item || !Array.isArray(item.modifiers)) {
+      return item;
+    }
+
+    const modifierCounts = {};
+
+    return {
+      ...item,
+      modifiers: item.modifiers.filter(modifier => {
+        if (
+          modifierActions.isPaymentModifier(modifier) ||
+          modifierActions.isCalculatedPaymentModifier(modifier) ||
+          !modifier.modifierId ||
+          !modifierActions.isDirect(modifier)
+        )
+          return true;
+
+        const count = modifierCounts[modifier.modifierId] || 0;
+
+        if (count < item.quantity) {
+          modifierCounts[modifier.modifierId] = count + 1;
+          return true;
+        }
+
+        return false;
+      }),
+    };
+  };

package/lib/modifier/index.js

@@ -149,6 +149,7 @@ const isGroup = require('./isGroup');
 const isOptionsSelectedOverride = require('./isOptionsSelectedOverride');
 const isFixedSubtract = require('./isFixedSubtract');
 const isQuantityMultiplier = require('./isQuantityMultiplier');
+const isCompute = require('./isCompute');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -311,6 +312,7 @@ const modifierActions = (deps = {}) => {
     isOptionsSelectedOverride: isOptionsSelectedOverride(innerDeps),
     isFixedSubtract: isFixedSubtract(innerDeps),
     isQuantityMultiplier: isQuantityMultiplier(innerDeps),
+    isCompute: isCompute(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/isCompute.js

@@ -0,0 +1,10 @@
+module.exports = () =>
+  function isCompute(modifier) {
+    if (!modifier || !modifier.compute) return false;
+
+    return (
+      !!modifier.compute.action &&
+      !!modifier.compute.type &&
+      typeof modifier.compute.amount === 'number'
+    );
+  };

package/lib/order/addItemModifier.js

@@ -177,6 +177,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     itemIndex,
     cache,
     onConditionsNotMet,
+    onError,
   }) {
     let order = _.cloneDeep(orderProp);
     if (!order || itemIndex < 0 || !modifier) return order;
@@ -223,6 +224,16 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       return order;
     }
 
+    if (
+      contains &&
+      modifierActions.isCompute(modifier) &&
+      !modifierActions.isQuantityMultiplier(modifier)
+    ) {
+      if (onError)
+        onError('modifier.has.reached.the.maximum.amount.of.applies');
+      return order;
+    }
+
     item = addModifier({
       item,
       modifier,

package/lib/store/pickEndDate.js

@@ -4,21 +4,20 @@ module.exports = ({ settings, _, moment }) => {
   const getClosedDays = () => {
     const schedule = _.get(settings, 'schedule', {});
     const { close = [] } = schedule;
-
     if (!Array.isArray(close)) return [];
-    return close.map(closedDate => ({
-      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 close;
   };
 
+  const MAX_ADD_DAYS = 365;
+
   return function pickEndDate(schedule = {}) {
     const {
-      addDays = 1,
+      addDays: addDaysParam,
       hour,
       minute,
       skipDays = [],
       cutHour,
-      cutDay = 1,
+      cutDay = 0,
     } = schedule;
 
     const todayTZ = moment().tz(timezone);
@@ -26,36 +25,45 @@ module.exports = ({ settings, _, moment }) => {
     const closedDays = getClosedDays();
     const todayHours = todayTZ.get('hours');
     const todayMinutes = todayTZ.get('minutes');
+
+    const addDays =
+      typeof addDaysParam !== 'number' || addDaysParam > MAX_ADD_DAYS
+        ? 0
+        : addDaysParam;
+
     if (
       (cutHour && todayHours > cutHour.hour) ||
       (todayHours >= cutHour.hour && todayMinutes > cutHour.minute)
     ) {
-      endDateTZ = endDateTZ.add(cutDay, 'days'); // if the cut day is zero should we add a day based on hours? ask Nabil/Vicky
+      endDateTZ = endDateTZ.add(cutDay, 'days');
     }
 
-    endDateTZ.add(addDays, 'days');
-    // do the logic related to skipdays
-    // if the date already pass the skip day, do nothing
-    // if the date is the same as one of the skip day, check the next skip day if any, then add one more day
-    skipDays.forEach(day => {
-      if (todayTZ.isoWeekday() <= day) {
-        endDateTZ.add(1, 'days');
-      }
-    });
-
-    /**
-     * setting the hour and minute so we can compare with closedDays
-     */
-    closedDays.forEach(closed => {
-      const closedDay = moment(closed.date);
-      closedDay.set('hour', hour);
-      closedDay.set('minute', minute);
-      if (endDateTZ.startOf('day').isSame(closedDay, 'day')) {
-        endDateTZ.add(1, 'days');
-      }
-    });
     if (hour !== undefined) endDateTZ.set('hour', hour);
     if (minute !== undefined) endDateTZ.set('minute', minute);
+    endDateTZ.set('second', 0);
+
+    const isSkipDay = endDateIsoWeekDay => {
+      if (skipDays.length >= 7) return false;
+      return skipDays.includes(endDateIsoWeekDay);
+    };
+
+    const isClosedDay = endDate =>
+      closedDays.some(
+        closedDate => endDate.format('YYYY-MM-DD') === closedDate.date
+      );
+
+    let addedDays = 0;
+
+    while (
+      addedDays < addDays ||
+      isSkipDay(endDateTZ.isoWeekday()) ||
+      isClosedDay(endDateTZ)
+    ) {
+      if (!isSkipDay(endDateTZ.isoWeekday()) && !isClosedDay(endDateTZ)) {
+        addedDays += 1;
+      }
+      endDateTZ.add(1, 'days');
+    }
 
     return moment.utc(endDateTZ).format();
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.54",
+  "version": "1.0.56",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -20,6 +20,8 @@
     "test:split": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/split.test.js",
     "test:getModifierTags": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/item/getModifierTags.test.js",
     "test:createIndirectModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/createIndirectModifier.test.js",
+    "test:conditionsNotMet": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/conditionsNotMet.test.js",
+    "test:pickEndDate": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/pickEndDate.test.js",
     "lint": "eslint --quiet lib/"
   },
   "publishConfig": {
@@ -43,5 +45,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "8bba2c9f52f54528ea2d0dece82406ef9fe69cb3"
+  "gitHead": "41b3ae5dcaec11195920c3b5f0a97b34b3982815"
 }

package/__TEST__/mocks/scripts/calculate-partially-paid/index.js

@@ -1,27 +0,0 @@
-const usePricing = require('../../../../index');
-
-const orderToStr = require('../order-to-string');
-
-const orderPartiallyPaid = require('../../partially-paid/order-partially-paid.json');
-const orderModifiers = require('../../partially-paid/order-modifiers.json');
-const inputItems = require('../../partially-paid/input-items.json');
-
-const pricingService = usePricing();
-
-const paymentModifiers = orderModifiers.map(orderMod =>
-  pricingService.modifier.duplicate({
-    orderMod,
-    items: inputItems,
-  })
-);
-
-let order = { ...orderPartiallyPaid };
-
-order = pricingService.order.addModifiers({
-  modifiers: paymentModifiers,
-  order,
-});
-
-const resultedOrder = pricingService.order.calculate(order);
-
-orderToStr(resultedOrder);

package/__TEST__/mocks/scripts/calculate-unpaid/index.js

@@ -1,28 +0,0 @@
-const usePricing = require('../../../../index');
-
-const orderToStr = require('../order-to-string');
-
-const orderUnpaid = require('../../unpaid/order-not-paid.json');
-const orderModifiers = require('../../unpaid/order-modifiers.json');
-const inputItems = require('../../unpaid/input-items.json');
-
-const pricingService = usePricing();
-
-const paymentModifiers = orderModifiers.map(orderMod =>
-  pricingService.modifier.duplicate({
-    ...orderMod,
-    items: inputItems,
-  })
-);
-
-let order = { ...orderUnpaid };
-
-if (paymentModifiers.length > 0)
-  order = pricingService.order.addModifiers({
-    modifiers: paymentModifiers,
-    order,
-  });
-
-const resultedOrder = pricingService.order.calculate(order);
-
-orderToStr(resultedOrder);

package/__TEST__/mocks/scripts/order-to-string.js

@@ -1,18 +0,0 @@
-module.exports = function orderToString(order) {
-  const { total, totalPaid, items } = order;
-
-  console.log({ total, totalPaid });
-  items.map(item => {
-    console.log('****');
-    console.log({
-      name: item.name,
-      price: item.price,
-      total: item.total,
-      totalPaid: item.totalPaid,
-      subtotals: item.subTotals,
-    });
-    item.modifiers.map(mod => {
-      console.log('modifier _computed', mod._computed);
-    });
-  });
-};