@darkpos/pricing 1.0.59 → 1.0.60

package/__TEST__/modifier.test.js

@@ -187,7 +187,6 @@ describe('Modifier actions', () => {
       onError: errorMessage => {
         error = errorMessage;
       },
-      cache: { items: [], modifiers: [] },
     });
 
     expect(conditionsBag).toEqual([]);

package/__TEST__/order/addItem.test.js

@@ -34,7 +34,6 @@ describe('addItem function', () => {
       order,
       item,
       itemIndex: -1, // No existing item in order
-      cache: addItemObj.cache, // Assuming some cache object
       overridenQuantity: -1, // No overridden quantity
     });
 
@@ -79,7 +78,6 @@ describe('addItem function', () => {
       order,
       item,
       itemIndex: -1, // Assuming no explicit index
-      cache: addItemObj.cache, // Assuming some cache object
       overridenQuantity: -1, // No overridden quantity
     });
 
@@ -111,7 +109,6 @@ describe('addItem function', () => {
       order,
       item,
       itemIndex: -1, // Assuming no explicit index
-      cache: addItemObj.cache, // Assuming some cache object
       overridenQuantity: 5, // Override quantity to 5
     });
 
@@ -191,7 +188,6 @@ describe('addItem function', () => {
       order,
       item,
       itemIndex: -1, // Assuming no explicit index
-      cache: addItemObj.cache, // Assuming some cache object
       overridenQuantity: -1, // No overridden quantity
     });
 

package/__TEST__/order/order.test.js

@@ -3127,7 +3127,6 @@ describe('Order actions', () => {
     const updatedOrder = pricingService.order.setCustomer({
       order,
       customer: {},
-      cache: {},
     });
 
     expect(updatedOrder).toStrictEqual({
@@ -3153,7 +3152,6 @@ describe('Order actions', () => {
     const updatedOrder2 = pricingService.order.setCustomer({
       order,
       customer: { _id: 'abd', tags: [] },
-      cache: {},
     });
 
     expect(updatedOrder2).toStrictEqual({

package/lib/item/findOriginalItem.js

@@ -1,8 +1,8 @@
 module.exports = () =>
-  function findOriginalItem({ item, cache = {} }) {
+  function findOriginalItem({ item, originalItems }) {
     const original =
-      Array.isArray(cache.items) &&
-      cache.items.find(each => each._id === item.itemId);
+      Array.isArray(originalItems) &&
+      originalItems.find(each => each._id === item.itemId);
 
     return original || item;
   };

package/lib/item/getItemPrice.js

@@ -1,20 +1,15 @@
-module.exports = ({ actions, modifierActions, utils }) => {
+module.exports = ({ modifierActions, utils }) => {
   const { math } = utils;
 
   const getCustomerTags = (customer = {}) =>
     ((customer && customer.tags) || []).filter(Boolean);
 
-  return function getItemPrice({ item, cache, customer }) {
+  return function getItemPrice({ item, customer, itemPriceLevels }) {
     const modifiers = item.modifiers || [];
     let { priceLevels } = item;
 
-    // get cache Item
-    if (cache && cache.items) {
-      const orgItem = actions.findOriginalItem({
-        item,
-        cache,
-      });
-      ({ priceLevels } = orgItem);
+    if (Array.isArray(itemPriceLevels)) {
+      priceLevels = itemPriceLevels;
     }
 
     if (!priceLevels) return item.price || 0;

package/lib/item/removeModifier.js

@@ -5,15 +5,6 @@ module.exports = ({ modifierActions, _, actions }) => {
   const isValid = (itemModifiers, modifier) => {
     if (!modifierActions.findById(itemModifiers, modifier._id)) return false;
 
-    // 18-SEP-24 - Commenting out due to bug: https://app.clickup.com/t/86duna31h.
-    // This logic was preventing required Order Discounts to be removed from the items.
-    // if (
-    //   modifierActions.isRequired(modifier) &&
-    //   !modifierActions.isGroupOfValues(modifier) &&
-    //   !modifierActions.isRequiredAndOverride(modifier)
-    // )
-    //   return false;
-
     if (
       !modifierActions.isGroupOfItems(modifier) &&
       hasRelatedItems(itemModifiers)
@@ -23,14 +14,7 @@ module.exports = ({ modifierActions, _, actions }) => {
     return true;
   };
 
-  return function removeModifier({
-    item,
-    modifier,
-    customer,
-    cache = {
-      items: [],
-    },
-  }) {
+  return function removeModifier({ item, modifier, customer, originalItem }) {
     const nextItem = _.cloneDeep(item);
     const itemModifiers = item.modifiers || [];
     let modifiersToApply = [];
@@ -39,7 +23,9 @@ module.exports = ({ modifierActions, _, actions }) => {
 
     // Check for multiple and add them to menuModifiers
     if (modifierActions.hasAddModifiers(modifier)) {
-      const relatedModifiers = modifierActions.getRelatedModifiers(modifier);
+      const relatedModifiers = modifierActions.getRelatedModifiers({
+        modifier,
+      });
       // Removing only those children who are selected
       const currentModifiersIds = itemModifiers.map(each => each.modifierId);
       modifiersToApply = relatedModifiers.filter(each =>
@@ -61,15 +47,12 @@ module.exports = ({ modifierActions, _, actions }) => {
     );
 
     if (hasOverride) {
-      const originalItem =
-        cache.items.find(_item => _item._id === item.itemId) || item;
-
       if (modifierActions.isQuantityOverride(modifier)) nextItem.quantity = 1;
 
       if (modifierActions.isPriceOverride(modifier))
         nextItem.price = actions.getItemPrice({
           item: originalItem,
-          cache,
+          itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
           customer,
         });
     }

package/lib/item/removeModifiers.js

@@ -1,11 +1,11 @@
 module.exports = ({ actions }) =>
-  function removeModifiers({ item, modifiers, cache, customer }) {
+  function removeModifiers({ item, modifiers, originalItem, customer }) {
     const newItem = modifiers.reduce(
       (nextItem, modifier) =>
         actions.removeModifier({
           item: nextItem,
           modifier,
-          cache,
+          originalItem,
           customer,
         }),
       item

package/lib/item/removeModifiersByQuantity.js

@@ -12,6 +12,7 @@ module.exports = ({ modifierActions }) =>
         if (
           modifierActions.isPaymentModifier(modifier) ||
           modifierActions.isCalculatedPaymentModifier(modifier) ||
+          modifierActions.isGroupOfModifiers(modifier) ||
           !modifier.modifierId ||
           !modifierActions.isDirect(modifier)
         )

package/lib/modifier/getGroupModifiers.js

@@ -1,9 +1,12 @@
 module.exports = () =>
-  function getGroupModifiers({ modifier, includeParent = true }) {
+  function getGroupModifiers({ modifier }) {
     const { properties } = modifier;
-    if (!properties || !properties.group) return [];
-    const { modifiers = [] } = properties.group;
-    const groupModifiers = [...modifiers];
-    if (includeParent) groupModifiers.push(modifier);
-    return groupModifiers.filter(Boolean);
+    if (
+      !properties ||
+      !properties.group ||
+      !Array.isArray(properties.group.modifiers)
+    )
+      return [];
+
+    return properties.group.modifiers;
   };

package/lib/modifier/getGroupRelatedModifiers.js

@@ -1,25 +1,18 @@
-module.exports = ({ actions }) => {
-  const find = (modifiers = [], modifierId = '') =>
-    modifiers.find(each => each._id === modifierId);
-  // This method returns all modifiers which are referenced by a modifier
-  return function getGroupRelatedModifiers({ cache, modifier }) {
+module.exports = ({ actions }) =>
+  // This method returns all modifiers which are in properties.group.modifiers
+  function getGroupRelatedModifiers({ modifier }) {
     if (!modifier) return [];
-    const checkCache = Array.isArray(cache) && cache.length;
-    const modifiers = actions.getGroupModifiers({
+    const groupModifiers = actions.getGroupModifiers({
       modifier,
-      includeParent: false,
     });
 
-    const groupModifiers = modifiers.reduce((arr, each) => {
-      if (!each || !each._id) return arr;
-      if (checkCache) {
-        const org = find(cache, each.modifierId || each._id);
-        if (org) arr.push(org);
-      }
-      return arr;
-    }, []);
-
-    if (actions.includesInGroup(modifier))
+    if (
+      actions.includesInGroup(modifier) &&
+      !groupModifiers.some(
+        groupMod =>
+          groupMod._id === modifier._id || groupMod.modifierId === modifier._id
+      )
+    )
       groupModifiers.unshift({
         ...actions.removeGroupData({ modifier }),
         required: false,
@@ -27,4 +20,3 @@ module.exports = ({ actions }) => {
 
     return groupModifiers;
   };
-};

package/lib/modifier/getItemModifiers.js

@@ -1,5 +1,5 @@
 module.exports = ({ actions }) =>
-  function getItemModifiers({ modifiers, customer, cache }) {
+  function getItemModifiers({ modifiers, customer }) {
     const matchedModifiers = actions.getMatchTagsModifiers({
       modifiers,
       entity: customer,
@@ -13,19 +13,11 @@ module.exports = ({ actions }) =>
       .map(each =>
         actions.getRelatedModifiers({
           modifier: each,
-          modifiers,
         })
       )
       .reduce((acc, val) => acc.concat(val), []);
 
-    const starchModifier = actions.getStarchModifier({
-      cache,
-      modifiers: enabledModifiers,
-      starch: customer && customer.properties && customer.properties.starch,
-    });
-
     const itemModifiers = [...enabledModifiers, ...relatedModifiers];
-    if (starchModifier) itemModifiers.push(starchModifier);
 
     return itemModifiers.map(each => ({
       ...each,

package/lib/modifier/getRelatedModifiers.js

@@ -1,10 +1,8 @@
-module.exports = ({ actions }) =>
-  function getRelatedModifiers({ modifier, modifiers }) {
-    if (!modifier || !modifier.addModifiers || !modifiers) return [];
-    // get related modifiers
-    const relatedModifiers = modifier.addModifiers
-      .map(each => actions.findById(modifiers, each._id))
-      .filter(Boolean);
+module.exports = () =>
+  function getRelatedModifiers({ modifier }) {
+    if (!modifier || !modifier.addModifiers) return [];
+
+    const relatedModifiers = modifier.addModifiers;
 
     return relatedModifiers;
   };

package/lib/modifier/index.js

@@ -41,7 +41,6 @@ const getGroupModifiers = require('./getGroupModifiers');
 const getImages = require('./getImages');
 const getItemModifiers = require('./getItemModifiers');
 const getInheritedModifiers = require('./getInheritedModifiers');
-const getLaundryModifiers = require('./getLaundryModifiers');
 const getMatchTagsModifiers = require('./getMatchTagsModifiers');
 const getModifierIndex = require('./getModifierIndex');
 const getModifiersByMaxSort = require('./getModifiersByMaxSort');
@@ -55,7 +54,6 @@ const getRequiredModifiers = require('./getRequiredModifiers');
 const getSelectedValues = require('./getSelectedValues');
 const getSubscriptionItem = require('./getSubscriptionItem');
 const getSubscriptionModifiers = require('./getSubscriptionModifiers');
-const getStarchModifier = require('./getStarchModifier');
 const getService = require('./getService');
 const getSplittedModifiers = require('./getSplittedModifiers');
 const getSuggestion = require('./getSuggestion');
@@ -204,7 +202,6 @@ const modifierActions = (deps = {}) => {
     getImages: getImages(innerDeps),
     getInheritedModifiers: getInheritedModifiers(innerDeps),
     getItemModifiers: getItemModifiers(innerDeps),
-    getLaundryModifiers: getLaundryModifiers(innerDeps),
     getMatchTagsModifiers: getMatchTagsModifiers(innerDeps),
     getModifierIndex: getModifierIndex(innerDeps),
     getModifiersByMaxSort: getModifiersByMaxSort(innerDeps),
@@ -218,7 +215,6 @@ const modifierActions = (deps = {}) => {
     getSelectedValues: getSelectedValues(innerDeps),
     getSubscriptionItem: getSubscriptionItem(innerDeps),
     getSubscriptionModifiers: getSubscriptionModifiers(innerDeps),
-    getStarchModifier: getStarchModifier(innerDeps),
     getService: getService(innerDeps),
     getSplittedModifiers: getSplittedModifiers(innerDeps),
     getSuggestion: getSuggestion(innerDeps),

package/lib/modifier/isPreferences.js

@@ -3,6 +3,6 @@ module.exports = ({ settings, _ }) => {
 
   return function isPreferences(modifier) {
     const preferences = getPreferencesSettings();
-    return modifier.group && preferences.includes(modifier.group.toLowerCase());
+    return modifier.group && preferences.includes(modifier.group);
   };
 };

package/lib/order/addItem.js

@@ -106,7 +106,6 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
     order: orderProp,
     item,
     itemIndex,
-    cache,
     overridenQuantity,
   }) {
     if (!orderProp || !item) return orderProp;
@@ -153,8 +152,9 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
 
     if (!combined) {
       // add price
+
       orderItem.price = itemActions.getItemPrice({
-        cache,
+        itemPriceLevels: item.priceLevels,
         customer,
         item: orderItem,
       });
@@ -178,7 +178,6 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
     let requiredModifiers = modifierActions.getItemModifiers({
       modifiers: itemModifiers,
       customer,
-      cache,
     });
     // Do not add again if they are already there
     if (
@@ -203,7 +202,7 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
       order,
       item: orderItem,
       combined,
-      cache,
+      originalItem: item,
     });
 
     const params = addOrderItem({
@@ -227,7 +226,7 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
               itemIndex: nextItemIndex,
               order: acc,
               modifier,
-              cache,
+              originalItem: item,
             }),
           nextOrder
         );

package/lib/order/addItemModifier.js

@@ -98,11 +98,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     modifier: _modifier,
     item: itemProp,
     customer,
-    cache = {
-      modifiers: [],
-      items: [],
-      itemModifiers: [],
-    },
+    originalItem,
     onConditionsNotMet,
   }) => {
     const modifier = _modifier; // to avoid no param reassign lint rule
@@ -164,7 +160,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       };
       item.price = itemActions.getItemPrice({
         item,
-        cache,
+        itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
         customer,
       });
     }
@@ -175,7 +171,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     order: orderProp,
     modifier,
     itemIndex,
-    cache,
+    originalItem,
     onConditionsNotMet,
     onError,
   }) {
@@ -219,7 +215,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
         order,
         modifier,
         itemIndex,
-        cache,
+        originalItem,
       });
       return order;
     }
@@ -237,26 +233,23 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     item = addModifier({
       item,
       modifier,
-      cache,
+      originalItem,
       customer,
       onConditionsNotMet,
     });
 
     // Recursive Rules:
     if (modifierActions.hasAddModifiers(modifier)) {
-      let relatedModifiers = modifierActions.getRelatedModifiers({
-        modifier,
-        modifiers: cache.modifiers,
-      });
-      relatedModifiers = relatedModifiers.filter(
-        each => !modifierActions.contains(item.modifiers, each)
-      );
+      const relatedModifiers = modifierActions
+        .getRelatedModifiers({ modifier })
+        .filter(each => !modifierActions.contains(item.modifiers, each));
+
       item = relatedModifiers.reduce(
         (acc, each) =>
           addModifier({
             item: acc,
             modifier: each,
-            cache,
+            originalItem,
             customer,
           }),
         item
@@ -280,7 +273,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
             },
           },
           order: acc,
-          cache,
+          originalItem,
         });
         return nextOrder;
       }, order);

package/lib/order/addModifierToAllItems.js

@@ -1,5 +1,5 @@
 module.exports = ({ actions }) =>
-  function addModifierToAllItems({ order, modifier, cache }) {
+  function addModifierToAllItems({ order, modifier, originalItems }) {
     if (!order || !Array.isArray(order.items) || !modifier) return order;
 
     const nextOrder = Object.entries(order.items).reduce(
@@ -8,7 +8,7 @@ module.exports = ({ actions }) =>
           itemIndex,
           modifier,
           order: acc,
-          cache,
+          originalItems,
         }),
       order
     );

package/lib/order/getOrderItemSubscriptions.js

@@ -1,7 +1,7 @@
 module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
   const { math } = utils;
 
-  return ({ order, item, combined, cache }) => {
+  return ({ order, item, combined, originalItem }) => {
     const [hasSubscription, remaining, used] = actions.hasRemainingSubscription(
       {
         order,
@@ -20,7 +20,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       orderItem = itemActions.removeModifiers({
         item: orderItem,
         modifiers: subscriptionModifiers,
-        cache,
+        originalItem,
         customer: order.customer,
       });
     }

package/lib/order/removeItemModifier.js

@@ -34,14 +34,13 @@ module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
     order: orderProp,
     modifier,
     itemIndex,
-    cache,
+    originalItem,
   }) {
     const order = _.cloneDeep(orderProp);
     if (!order || itemIndex < 0 || !modifier) return order;
 
     let item = actions.getSelectedItem({ order, itemIndex });
     const customer = actions.getCustomer(order);
-    const originalItem = cache.items.find(_item => _item._id === item.itemId);
     const contains = modifierActions.contains(item.modifiers, modifier);
 
     if (!contains) return order;
@@ -59,7 +58,7 @@ module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
     });
     item.price = itemActions.getItemPrice({
       item,
-      cache,
+      itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
       customer,
     });
     order.items[itemIndex] = item;

package/lib/order/setCustomer.js

@@ -2,7 +2,7 @@ module.exports = ({ itemActions, modifierActions, _ }) => {
   const getTags = customer =>
     (customer.tags || []).map(tag => tag.toLowerCase());
 
-  return function setCustomer({ order, customer, cache }) {
+  return function setCustomer({ order, customer, originalItems }) {
     if (!order) return null;
 
     const { items = [] } = order;
@@ -20,19 +20,22 @@ module.exports = ({ itemActions, modifierActions, _ }) => {
 
     nextOrder.items = items.map(nextItem => {
       const { itemModifiers, ...item } = nextItem;
-      const originalItem = itemActions.findOriginalItem({ item, cache });
+      const originalItem = itemActions.findOriginalItem({
+        item,
+        originalItems,
+      });
+
       if (!originalItem) return item;
 
       const newModifiers = modifierActions.getItemModifiers({
         modifiers: itemModifiers,
         customer,
-        cache,
       });
 
       const price = itemActions.getItemPrice({
         item,
         customer,
-        cache,
+        itemPriceLevels: originalItem.priceLevels,
       });
 
       const filterExistingModifiers = () =>

package/lib/order/updateItemQuantity.js

@@ -5,7 +5,7 @@ module.exports = ({ actions, settings, _ }) => {
     quantity,
     itemIndex,
     reset,
-    cache,
+    originalItem,
   }) {
     const item = actions.getSelectedItem({ order, itemIndex });
     const isBefore = orderSettings.useKeypadOnItemAdd === 'before';
@@ -27,7 +27,7 @@ module.exports = ({ actions, settings, _ }) => {
       const result = actions.addItem({
         order,
         item: { isPending: true },
-        cache,
+        originalItem,
         overridenQuantity: quantity,
       });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.59",
+  "version": "1.0.60",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -45,5 +45,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "a18ca520a52fa2ab8acc3a61e70e559e8759accf"
+  "gitHead": "35464665224775509b837dfca3405adc2c7a881a"
 }

package/lib/modifier/getLaundryModifiers.js

@@ -1,9 +0,0 @@
-module.exports = ({ actions }) =>
-  function getLaundryModifiers(modifiers = []) {
-    return modifiers.filter(
-      each =>
-        actions.isDepartment(each) &&
-        each.properties.department.code &&
-        each.properties.department.code.toLowerCase() === 'l'
-    );
-  };

package/lib/modifier/getStarchModifier.js

@@ -1,9 +0,0 @@
-module.exports = ({ actions }) =>
-  function getStarchModifier({ modifiers, starch, cache = {} }) {
-    const laundryModifiers = actions.getLaundryModifiers(modifiers);
-
-    if (cache && cache.modifiers && laundryModifiers.length && starch)
-      return actions.findById(cache.modifiers, starch);
-
-    return null;
-  };