@darkpos/pricing 1.0.10 → 1.0.11

package/lib/item/removeModifier.js

@@ -59,7 +59,7 @@ module.exports = ({ modifierActions, _, actions }) => {
     );
 
     const hasOverride = modifiersToApply.find(each =>
-      modifierActions.isOverride(each)
+      modifierActions.isOverride(each) || modifierActions.isComputedOverride(each)
     );
 
     if (hasOverride) {
@@ -68,7 +68,7 @@ module.exports = ({ modifierActions, _, actions }) => {
 
       if (modifierActions.isQuantityOverride(modifier)) nextItem.quantity = 1;
 
-      if (modifierActions.isPriceOverride(modifier))
+      if (modifierActions.isPriceOverride(modifier) || modifierActions.isComputedOverride(modifier))
         nextItem.price = actions.getItemPrice({
           item: originalItem,
           cache,

package/lib/modifier/calculate.js

@@ -1,7 +1,7 @@
 /**
  * Get calculated modifier
  */
-module.exports = ({ _, constants, utils, localization, actions }) => {
+ module.exports = ({ _, constants, utils, localization, actions }) => {
   const { math } = utils;
   const { Modifier } = constants;
 
@@ -29,7 +29,7 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
         );
 
       if (!type || action === Modifier.Compute.Actions.OVERRIDE)
-        _computed.amount = amount;
+        _computed.amount = 0;
 
       if (maxAmount && math.gt(math.abs(_computed.amount), maxAmount))
         _computed.amount = maxAmount;

package/lib/modifier/index.js

@@ -85,6 +85,7 @@ const isService = require('./isService');
 const isSingleValue = require('./isSingleValue');
 const isGroupOfItems = require('./isGroupOfItems');
 const isOverride = require('./isOverride');
+const isComputedOverride = require('./isComputedOverride');
 const isDepartment = require('./isDepartment');
 const isRequired = require('./isRequired');
 const isMultiplier = require('./isMultiplier');
@@ -207,6 +208,7 @@ const modifierActions = (deps = {}) => {
     isSingleValue: isSingleValue(innerDeps),
     isGroupOfItems: isGroupOfItems(innerDeps),
     isOverride: isOverride(innerDeps),
+    isComputedOverride: isComputedOverride(innerDeps),
     isDepartment: isDepartment(innerDeps),
     isRequired: isRequired(innerDeps),
     isMultiplier: isMultiplier(innerDeps),

package/lib/modifier/isComputedOverride.js

@@ -0,0 +1,7 @@
+module.exports = ({ actions, constants }) => {
+  const { Modifier } = constants;
+  return function isComputedOverride(modifier) {
+    const computeAction = modifier && modifier.compute && modifier.compute.action;
+    return computeAction === Modifier.Attributes.OVERRIDE;
+  };
+};

package/lib/order/addItemModifier.js

@@ -76,7 +76,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     // group of values use case
     if (
       modifierActions.isGroupOfValues(modifier) ||
-      modifierActions.isRequiredAndOverride(modifier)
+      modifierActions.isOverride(modifier)
     ) {
       if (modifierIndex > -1) item.modifiers[modifierIndex] = modifierToAdd;
       else item.modifiers.push(modifierToAdd);
@@ -99,7 +99,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       item.quantity = modifier.compute.amount || 1;
     }
 
-    if (modifierActions.isPriceOverride(modifier)) {
+    if (modifierActions.isPriceOverride(modifier) ||  modifierActions.isComputedOverride(modifier)) {
       item.price = getPrice({ modifier, item });
     } else {
       item.price = itemActions.getItemPrice({
@@ -144,7 +144,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       usingCount >= item.quantity &&
       !(
         modifierActions.isGroupOfValues(modifier) ||
-        modifierActions.isRequiredAndOverride(modifier)
+        modifierActions.isOverride(modifier)
       )
     ) {
       // console.log('Removing MODIFIER ...');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -35,5 +35,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "3519de2c00b9db1618cb8c417d270227a5ddc822"
+  "gitHead": "d839ed87a99ef0c4297ba95cd647e358cba38639"
 }