@darkpos/pricing 1.0.114 → 1.0.116

package/__TEST__/modifier/hasModifier.test.js

@@ -1728,7 +1728,21 @@ describe('hasModifier Function', () => {
     expect(updatedOrder2.items[1]).toMatchObject({
       _id: 1,
       itemId: 'ab',
-      modifiers: [],
+      modifiers: [
+        {
+          _id: 'groupMod10',
+          attributes: ['group'],
+          properties: {
+            group: {
+              items: [{ _id: 'abc', name: 'related item abc', itemId: 'abc' }],
+              modifiers: [{ _id: '123', name: 'related mod' }],
+            },
+          },
+          conditions: { valid: true },
+          compute: null,
+          _computed: { amount: 0, description: 'undefined' },
+        },
+      ],
       price: 0,
       total: 0,
       subTotals: {

package/lib/item/calculate.js

@@ -4,7 +4,10 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
   //
 
   const calculateOne = (inputItem, opts = {}) => {
-    const item = _.cloneDeep(inputItem);
+    const item = _.cloneDeep({
+      ...inputItem,
+      quantity: math.max(0, Number(inputItem.quantity) || 0),
+    });
     const amountToPay =
       typeof opts.amountToPay === 'number' ? opts.amountToPay : 0;
     const paymentMethod = opts.paymentMethod || null;
@@ -41,11 +44,9 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
     }
 
     const modifiers = [];
-    let { modifiers: itemModifiersPrev = [] } =
-      actions.removeModifiersByQuantity(item);
 
-    itemModifiersPrev = modifierActions.unlockCustomerStatsModifiers({
-      modifiers: itemModifiersPrev,
+    const itemModifiersPrev = modifierActions.unlockCustomerStatsModifiers({
+      modifiers: item.modifiers,
       customer,
     });
 

package/lib/item/index.js

@@ -43,7 +43,7 @@ const getTotalsDifference = require('./getTotalsDifference');
 const getTotalNeareastDifference = require('./getTotalNeareastDifference');
 const getNoteTags = require('./getNoteTags');
 const getBasePrice = require('./getBasePrice');
-const removeModifiersByQuantity = require('./removeModifiersByQuantity');
+const validateModifiersByQuantity = require('./validateModifiersByQuantity');
 const getModifiersBySingleValueId = require('./getModifiersBySingleValueId');
 const getLastLocation = require('./getLastLocation');
 const hasAddModifiers = require('./hasAddModifiers');
@@ -126,7 +126,7 @@ const itemActions = (deps = {}) => {
     getTotalNeareastDifference: getTotalNeareastDifference(innerDeps),
     getNoteTags: getNoteTags(innerDeps),
     getBasePrice: getBasePrice(innerDeps),
-    removeModifiersByQuantity: removeModifiersByQuantity(innerDeps),
+    validateModifiersByQuantity: validateModifiersByQuantity(innerDeps),
     getModifiersBySingleValueId: getModifiersBySingleValueId(innerDeps),
     getLastLocation: getLastLocation(innerDeps),
     hasAddModifiers: hasAddModifiers(innerDeps),

package/lib/item/validateModifiers.js

@@ -1,4 +1,4 @@
-module.exports = ({ modifierActions }) =>
+module.exports = ({ modifierActions, actions }) =>
   function validateModifiers({
     item,
     itemModifiers,
@@ -11,7 +11,7 @@ module.exports = ({ modifierActions }) =>
     customer,
   }) {
     const validatedModifiers = [];
-    const firstValidatedModifiers = itemModifiers.map(each =>
+    let firstValidatedModifiers = itemModifiers.map(each =>
       modifierActions.validate(each, {
         item,
         startRequestDate,
@@ -24,6 +24,11 @@ module.exports = ({ modifierActions }) =>
       })
     );
 
+    firstValidatedModifiers = actions.validateModifiersByQuantity({
+      modifiers: firstValidatedModifiers,
+      quantity: item.quantity,
+    });
+
     const isIdMatch = (mod, modifierId) => {
       if (typeof mod === 'string') return mod === modifierId;
       return mod._id === modifierId;
@@ -58,13 +63,8 @@ module.exports = ({ modifierActions }) =>
         nextValidModifier.conditions.valid;
 
       if (shouldInvalidateAddModifier || shouldInvalidateDelModifier) {
-        nextValidModifier = {
-          ...nextValidModifier,
-          conditions: {
-            ...validModifier.conditions,
-            valid: false,
-          },
-        };
+        nextValidModifier =
+          modifierActions.markModifierAsNotValid(nextValidModifier);
       }
 
       if (

package/lib/item/validateModifiersByQuantity.js

@@ -0,0 +1,32 @@
+module.exports = ({ modifierActions, utils }) =>
+  function validateModifiersByQuantity({ modifiers, quantity }) {
+    if (!modifiers || !Array.isArray(modifiers)) {
+      return [];
+    }
+
+    const modifierCounts = {};
+
+    return modifiers.map(modifier => {
+      if (
+        modifierActions.isPaymentModifier(modifier) ||
+        modifierActions.isCalculatedPaymentModifier(modifier) ||
+        modifierActions.isGroupOfModifiers(modifier) ||
+        !modifier.modifierId ||
+        !modifierActions.isDirect(modifier) ||
+        modifierActions.isUnlimitedItemUse(modifier)
+      )
+        return modifier;
+
+      const count = modifierCounts[modifier.modifierId] || 0;
+
+      const maxApplies = modifierActions.getMaxItemUse(modifier) || 0;
+      const maxQuantity = utils.math.mul(quantity || 0, maxApplies) || quantity;
+
+      if (count < maxQuantity) {
+        modifierCounts[modifier.modifierId] = count + 1;
+        return modifier;
+      }
+
+      return modifierActions.markModifierAsNotValid(modifier);
+    });
+  };

package/lib/modifier/index.js

@@ -177,6 +177,7 @@ const isAutoSplit = require('./isAutoSplit');
 const isKeepRelatedItems = require('./isKeepRelatedItems');
 const isSplitDepartment = require('./isSplitDepartment');
 const isModifierValid = require('./isModifierValid');
+const markModifierAsNotValid = require('./markModifierAsNotValid');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -367,6 +368,7 @@ const modifierActions = (deps = {}) => {
     isKeepRelatedItems: isKeepRelatedItems(innerDeps),
     isSplitDepartment: isSplitDepartment(innerDeps),
     isModifierValid: isModifierValid(innerDeps),
+    markModifierAsNotValid: markModifierAsNotValid(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/markModifierAsNotValid.js

@@ -0,0 +1,10 @@
+module.exports = () =>
+  function markModifierAsNotValid(modifier) {
+    return {
+      ...modifier,
+      conditions: {
+        ...modifier.conditions,
+        valid: false,
+      },
+    };
+  };

package/lib/order/resetItem.js

@@ -6,7 +6,6 @@ module.exports = ({ itemActions }) =>
       {
         ...item,
         price: 0,
-        modifiers: [],
       },
       {}
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.114",
+  "version": "1.0.116",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -55,5 +55,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "cf91c373155b5fe5207ec9234abffd772fd3df40"
+  "gitHead": "f61e54dc3685291e31f65a542255e54d6c0923fe"
 }

package/lib/item/removeModifiersByQuantity.js

@@ -1,36 +0,0 @@
-module.exports = ({ modifierActions, utils }) =>
-  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) ||
-          modifierActions.isGroupOfModifiers(modifier) ||
-          !modifier.modifierId ||
-          !modifierActions.isDirect(modifier) ||
-          modifierActions.isUnlimitedItemUse(modifier)
-        )
-          return true;
-
-        const count = modifierCounts[modifier.modifierId] || 0;
-
-        const maxApplies = modifierActions.getMaxItemUse(modifier) || 0;
-        const maxQuantity =
-          utils.math.mul(item.quantity || 0, maxApplies) || item.quantity;
-
-        if (count < maxQuantity) {
-          modifierCounts[modifier.modifierId] = count + 1;
-          return true;
-        }
-
-        return false;
-      }),
-    };
-  };