@darkpos/pricing 1.0.11 → 1.0.12

package/lib/item/addIndirectModifier.js

@@ -41,10 +41,14 @@ module.exports = ({ utils, modifierActions }) => {
           compute: {
             ...inheritedModifier.compute,
             amount: math.add(
-              inheritedModifier.compute.amount,
-              math.div(difference, selectedItem.quantity)
+              math.mul(inheritedModifier.compute.amount, selectedItem.quantity),
+              difference
             ),
           },
+          properties: {
+            ...inheritedModifier.properties,
+            ignoreQuantity: true,
+          },
         };
       }
       return itemsModifiers;

package/lib/item/calculate.js

@@ -67,7 +67,9 @@ module.exports = ({ _, utils, modifierActions }) => {
         modifiers.push(_modifier);
         const { type, _computed } = _modifier;
         // console.log('computedPrice => ', _computed);
-        let computedAmount = math.mul(_computed.amount, quantity);
+        let computedAmount = modifierActions.isIgnoreQuantity(_modifier)
+          ? _computed.amount
+          : math.mul(_computed.amount, quantity);
         // subscription modifiers have fixed amount and can't be multiplied by quantity
         if (modifierActions.isSubscription(_modifier))
           computedAmount = _computed.amount;

package/lib/modifier/index.js

@@ -99,6 +99,7 @@ const isCustomerTagsExtend = require('./isCustomerTagsExtend');
 const isAmountOverride = require('./isAmountOverride');
 const isDiscount = require('./isDiscount');
 const isHidden = require('./isHidden');
+const isIgnoreQuantity = require('./isIgnoreQuantity');
 const isGratuity = require('./isGratuity');
 const isPaymentMethods = require('./isPaymentMethods');
 const isPaymentTypes = require('./isPaymentTypes');
@@ -221,6 +222,7 @@ const modifierActions = (deps = {}) => {
     isAmountOverride: isAmountOverride(innerDeps),
     isDiscount: isDiscount(innerDeps),
     isHidden: isHidden(innerDeps),
+    isIgnoreQuantity: isIgnoreQuantity(innerDeps),
     isGratuity: isGratuity(innerDeps),
     isPaymentMethods: isPaymentMethods(innerDeps),
     isPaymentTypes: isPaymentTypes(innerDeps),

package/lib/modifier/isIgnoreQuantity.js

@@ -0,0 +1,5 @@
+module.exports = () =>
+  function isIgnoreQuantity(modifier) {
+    if (!modifier || !modifier.properties) return false;
+    return modifier.properties.ignoreQuantity;
+  };

package/package.json

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