@darkpos/pricing 1.0.91 → 1.0.93

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/order/splitItems.js

@@ -1,4 +1,4 @@
-module.exports = ({ actions, modifierActions, itemActions }) =>
+module.exports = ({ actions, modifierActions, itemActions, utils }) =>
   function splitItems({ order }) {
     if (!order || !order.items) return order;
 
@@ -32,6 +32,7 @@ module.exports = ({ actions, modifierActions, itemActions }) =>
           ...item,
           quantity: splitQty,
           modifiers: [],
+          _id: utils.helpers.getObjectID(),
         });
         remaining -= splitQty;
       }

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,11 +38,16 @@ module.exports = ({ settings, _, moment }) => {
 
   const MAX_ADD_DAYS = 365;
 
-  return function pickEndDate(schedule = {}) {
-    const { addDays: addDaysParam, readyHour, cutHour, cutDay = 0 } = schedule;
-    const skipDays = schedule.skipDays || [];
+  return function pickEndDate(schedules, isoWeekday) {
+    const {
+      addDays: addDaysParam,
+      readyHour,
+      cutHour,
+      cutDay,
+      skipDays,
+      todayTZ,
+    } = getSchedule(schedules, isoWeekday);
 
-    const todayTZ = moment().tz(timezone);
     let endDateTZ = todayTZ.clone();
     const closedDays = getClosedDays();
     const todayHours = todayTZ.get('hours');
@@ -40,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.91",
+  "version": "1.0.93",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -27,6 +27,7 @@
     "test:modifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier.test.js",
     "test:paymentModifiers": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/order-payment-modifier.test.js",
     "test:addItem": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/addItem.test.js",
+    "test:getParentTotals": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/getParentTotals.test.js",
     "lint": "eslint --quiet lib/"
   },
   "publishConfig": {
@@ -51,5 +52,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "5526c9bdbba87270466443c92066c06c9fa87d52"
+  "gitHead": "fb466ad4fdad14d593a1ee3dc2814f683b10ec24"
 }

package/__TEST__/order/getRecommendedEndDate.test.js

@@ -1,96 +0,0 @@
-const moment = require('moment-timezone');
-const usePricing = require('../../lib/index');
-
-const defaults = {
-  store: {
-    _settings: {
-      order: {
-        endDate: {
-          readySchedule: [
-            {
-              _id: '682373ef8256034ae1f2c195',
-              dayOfWeek: [2],
-              recommended: 'auto_recommended',
-              addDays: 1,
-              cutDay: 1,
-              skipDays: undefined,
-              readyHour: null,
-              cutHour: null,
-            },
-          ],
-        },
-      },
-    },
-  },
-};
-describe('getRecommendedEndDate function', () => {
-  test('getRecommendedEndDate, skipDays undefined', () => {
-    const pricingService = usePricing(defaults);
-    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
-    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
-
-    const result = pricingService.store.getRecommendedEndDate();
-    expect(result).toBe('2025-05-14T15:00:00Z'); // 2025-05-14T15:00:00Z
-  });
-
-  test('getRecommendedEndDate, skipDays with dayOfWeek undefined', () => {
-    const pricingService = 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 = pricingService.store.getRecommendedEndDate();
-
-    expect(result).toBe(null); // null
-  });
-  test('getRecommendedEndDate, skipDays with one day', () => {
-    const pricingService = usePricing({
-      store: {
-        _settings: {
-          order: {
-            endDate: {
-              readySchedule: [
-                {
-                  _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 = pricingService.store.getRecommendedEndDate();
-
-    expect(result).toBe('2025-05-14T15:00:00Z'); // 2025-05-14T15:00:00Z
-  });
-});

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,25 +0,0 @@
-module.exports = ({ actions, settings }) => {
-  const getReadyScheduleSetting = () =>
-    (settings.order &&
-      settings.order.endDate &&
-      settings.order.endDate.readySchedule) ||
-    [];
-  return function getRecommendedEndDate() {
-    const readySchedule = getReadyScheduleSetting();
-
-    const dayOfWeek = new Date().getDay();
-    const day = dayOfWeek || 7;
-    const schedule = readySchedule.find(item => {
-      if (item && item.dayOfWeek) {
-        return item.dayOfWeek.includes(day);
-      }
-      return false;
-    });
-
-    return schedule
-      ? actions.pickEndDate({
-          ...schedule,
-        })
-      : null;
-  };
-};