@darkpos/pricing 1.0.97 → 1.0.100

package/lib/item/validateModifiers.js

@@ -0,0 +1,71 @@
+module.exports = ({ modifierActions }) =>
+  function validateModifiers({
+    item,
+    itemModifiers,
+    startRequestDate,
+    endRequestDate,
+    allItems,
+    paymentMethod,
+    paymentType,
+    isPrepay,
+  }) {
+    const validatedModifiers = [];
+    const firstValidatedModifiers = itemModifiers.map(each =>
+      modifierActions.validate(each, {
+        item,
+        startRequestDate,
+        endRequestDate,
+        allItems,
+        paymentMethod,
+        paymentType,
+        isPrepay,
+      })
+    );
+
+    firstValidatedModifiers.forEach(validModifier => {
+      const parentAddModifier = firstValidatedModifiers.find(
+        validMod =>
+          validMod.addModifiers &&
+          validMod.addModifiers.some(
+            addMod => addMod._id === validModifier.modifierId
+          )
+      );
+
+      const parentDelModifier = firstValidatedModifiers.find(
+        validMod =>
+          validMod.delModifiers &&
+          validMod.delModifiers.some(
+            delMod => delMod._id === validModifier.modifierId
+          )
+      );
+
+      let nextValidModifier = { ...validModifier };
+      const shouldInvalidateAddModifier =
+        parentAddModifier &&
+        !parentAddModifier.conditions.valid &&
+        nextValidModifier.conditions.valid;
+
+      const shouldInvalidateDelModifier =
+        parentDelModifier &&
+        parentDelModifier.conditions.valid &&
+        nextValidModifier.conditions.valid;
+
+      if (shouldInvalidateAddModifier || shouldInvalidateDelModifier) {
+        nextValidModifier = {
+          ...nextValidModifier,
+          conditions: {
+            ...validModifier.conditions,
+            valid: false,
+          },
+        };
+      }
+
+      if (
+        !validatedModifiers.some(validMod => validMod._id === validModifier._id)
+      ) {
+        validatedModifiers.push(nextValidModifier);
+      }
+    });
+
+    return validatedModifiers;
+  };

package/lib/modifier/getDepartmentModifiers.js

@@ -5,7 +5,7 @@ module.exports = ({ actions, utils }) => {
   return function getDepartmentModifiers(modifiers) {
     if (!modifiers || !Array.isArray(modifiers)) return [];
     return modifiers
-      .filter(each => actions.isDepartment(each))
+      .filter(each => actions.isValid(each) && actions.isDepartment(each))
       .sort((mod1, mod2) => math.sub(getOrder(mod1), getOrder(mod2)));
   };
 };

package/lib/modifier/getInheritedModifiers.js

@@ -25,6 +25,6 @@ module.exports = ({ actions }) => {
       if (inheritedModifiers.length) modifiers.push(...inheritedModifiers);
     }
 
-    return actions.purifyModifiers(modifiers);
+    return modifiers;
   };
 };

package/lib/modifier/index.js

@@ -102,7 +102,6 @@ const isPaymentTypeModifier = require('./isPaymentTypeModifier');
 const isPreferences = require('./isPreferences');
 const isCompact = require('./isCompact');
 const isCredit = require('./isCredit');
-const purifyModifiers = require('./purifyModifiers');
 const sort = require('./sort');
 const isPaymentModifier = require('./isPaymentModifier');
 const isSubtract = require('./isSubtract');
@@ -278,7 +277,6 @@ const modifierActions = (deps = {}) => {
     isCompact: isCompact(innerDeps),
     isCredit: isCredit(innerDeps),
     isIncluded: isIncluded(innerDeps),
-    purifyModifiers: purifyModifiers(innerDeps),
     sort: sort(innerDeps),
     isPaymentModifier: isPaymentModifier(innerDeps),
     isSubtract: isSubtract(innerDeps),

package/lib/order/addItemModifier.js

@@ -1,86 +1,12 @@
 module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
   const { math } = utils;
 
-  const filterByRemoveModifiers = (modifiers, modifier) => {
-    const { delModifiers = [] } = modifier;
-
-    return modifiers.filter(
-      each => !modifierActions.findById(delModifiers, each.modifierId)
-    );
-  };
-
-  const areConditionsMet = (item, conditions) => {
-    const conditionsBag = [];
-    if (!conditions || !conditions.rules) return conditionsBag;
-    // Find conditions with itemPieces as key
-    const itemPiecesConditions = conditions.rules.filter(
-      each => each.key === 'itemPieces'
-    );
-    if (itemPiecesConditions.length > 0) {
-      itemPiecesConditions.forEach(each => {
-        if (
-          !modifierActions.validateNumberCondition(
-            item.pieces,
-            each.value,
-            each.operand
-          )
-        ) {
-          conditionsBag.push({
-            name: `${each.operand}.itemPieces`,
-            value: each.value,
-            current: item.pieces,
-          });
-        }
-      });
-    }
-    const itemQtyConditions = conditions.rules.filter(
-      each => each.key === 'itemQuantity'
-    );
-    if (itemQtyConditions.length > 0) {
-      itemQtyConditions.forEach(each => {
-        if (
-          !modifierActions.validateNumberCondition(
-            item.quantity,
-            each.value,
-            each.operand
-          )
-        ) {
-          conditionsBag.push({
-            name: `${each.operand}.itemQuantity`,
-            value: each.value,
-            current: item.quantity,
-          });
-        }
-      });
-    }
-    const requiredModifiersConditions = conditions.rules.filter(
-      each => each.key === 'modifiers'
-    );
-    if (requiredModifiersConditions.length > 0) {
-      requiredModifiersConditions.forEach(each => {
-        if (
-          !modifierActions.validateRequiredModifiers(
-            item.modifiers,
-            each.value,
-            each.operand
-          )
-        ) {
-          conditionsBag.push({
-            name: `${each.operand}.modifiers`,
-            value: each.value,
-            current: item.modifiers,
-          });
-        }
-      });
-    }
-    return conditionsBag;
-  };
-
   const addModifier = ({
     order,
     modifier: _modifier,
     item: itemProp,
-    onConditionsNotMet,
+    customer,
+    originalItem,
     onError,
   }) => {
     if (
@@ -97,24 +23,21 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
 
     const modifier = modifierActions.removeGroupRelations(_modifier); // to avoid no param reassign lint rule
     const item = { ...itemProp };
-    const conditionsBag = areConditionsMet(item, modifier.conditions);
 
-    if (conditionsBag.length > 0 && !modifierActions.isRequired(modifier)) {
-      if (onConditionsNotMet) onConditionsNotMet(conditionsBag);
-      return item;
-    }
     const modifierToAdd = modifierActions.duplicate(modifier);
 
     item.modifiers.push(modifierToAdd);
 
-    if (modifierActions.isRemoveModifier(modifier)) {
-      item.modifiers = filterByRemoveModifiers(item.modifiers, modifier);
-    }
-
     item.properties = {
       ...(item.properties || {}),
     };
 
+    item.price = itemActions.getItemPrice({
+      item,
+      itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
+      customer,
+    });
+
     return item;
   };
 
@@ -123,7 +46,6 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     modifier,
     itemIndex,
     originalItem,
-    onConditionsNotMet,
     onError,
   }) {
     let order = _.cloneDeep(orderProp);
@@ -217,7 +139,6 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       modifier,
       originalItem,
       customer,
-      onConditionsNotMet,
       onError,
     });
 

package/lib/order/removeItemModifier.js

@@ -1,4 +1,4 @@
-module.exports = ({ actions, modifierActions, _ }) => {
+module.exports = ({ actions, modifierActions, itemActions, _ }) => {
   const removeModifier = ({ item, modifier }) => {
     const nextItem = { ...item, modifiers: [] };
 
@@ -29,6 +29,7 @@ module.exports = ({ actions, modifierActions, _ }) => {
       return order;
 
     let item = actions.getSelectedItem({ order, itemIndex });
+    const customer = actions.getCustomer(order);
 
     const contains = modifierActions.contains(item.modifiers, modifier);
 
@@ -41,6 +42,12 @@ module.exports = ({ actions, modifierActions, _ }) => {
       originalItem,
     });
 
+    item.price = itemActions.getItemPrice({
+      item,
+      itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
+      customer,
+    });
+
     order.items[itemIndex] = item;
 
     return order;

package/package.json

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

package/lib/modifier/purifyModifiers.js

@@ -1,15 +0,0 @@
-module.exports = ({ actions }) =>
-  function purifyModifiers(modifiers) {
-    if (!modifiers) return [];
-    const removeIds = modifiers
-      .filter(modifier => actions.isRemoveModifier(modifier))
-      .reduce(
-        (acc, modifier) => [
-          ...acc,
-          modifier.properties.delModifiers.map(each => each._id),
-        ],
-        []
-      );
-
-    return modifiers.filter(each => !removeIds.includes(each.modifierId));
-  };