@darkpos/pricing 1.0.22 → 1.0.24

package/lib/item/addIndirectModifier.js

@@ -25,7 +25,9 @@ module.exports = ({ utils, modifierActions }) => {
       );
     }, 0);
 
-    // check validation
+    if (modifier.compute.type === 'percentage' && modifier.type !== 'credit')
+      return itemsModifiers;
+
     if (math.abs(totalDistributed) !== math.abs(orderModifierTotal)) {
       const difference = math.sub(orderModifierTotal, totalDistributed);
       const selectedItem = items.find(

package/lib/item/calculate.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-syntax */
-module.exports = ({ _, utils, modifierActions }) => {
+module.exports = ({ _, utils, actions, modifierActions }) => {
   const { math } = utils;
   //
   const calculateOne = inputItem => {
@@ -66,14 +66,22 @@ module.exports = ({ _, utils, modifierActions }) => {
 
         modifiers.push(_modifier);
         const { type, _computed } = _modifier;
-        let computedAmount = modifierActions.isIgnoreQuantity(_modifier)
-          ? _computed.amount
-          : math.mul(_computed.amount, quantity);
+
+        const computedAmountCalc = math.mul(_computed.amount, quantity);
+        const computedPriceCalc = math.mul(computedPrice * quantity);
+
+        let computedAmount =
+          _modifier.compute.type === 'percentage' ||
+          modifierActions.isIgnoreQuantity(_modifier) ||
+          math.gt(math.abs(computedAmountCalc), computedPriceCalc)
+            ? _computed.amount
+            : computedAmountCalc;
+
         // subscription modifiers have fixed amount and can't be multiplied by quantity
         if (modifierActions.isSubscription(_modifier))
           computedAmount = _computed.amount;
 
-        prvPrice = math.add(prvPrice, computedAmount);
+        prvPrice = math.add(prvPrice, math.div(_computed.amount, quantity));
         prvSort = sort;
 
         if (included) {
@@ -90,7 +98,7 @@ module.exports = ({ _, utils, modifierActions }) => {
 
     subTotals._actual = math.add(subTotals._simple, subTotals._included);
 
-    const total = math.add(subTotals._actual, subTotals._xincluded);
+    const total = math.toDecimalPlaces(actions.getTotal({ subTotals }));
 
     return {
       ...item,

package/lib/item/getBalanceToPay.js

@@ -1,12 +1,12 @@
-module.exports = ({ utils }) =>
+module.exports = ({ utils, actions }) =>
   function getBalanceToPay({ orderItems = [] }) {
     const total = orderItems.reduce(
-      (t, item) => utils.math.add(t, item && item.total),
+      (t, item) => utils.math.add(actions.getTotal(item), t),
       0
     );
     const totalPaid = orderItems.reduce(
       (t, item) => utils.math.add(t, item && item.totalPaid),
       0
     );
-    return utils.math.sub(total, totalPaid);
+    return utils.math.toDecimalPlaces(utils.math.sub(total, totalPaid));
   };

package/lib/item/getTotal.js

@@ -2,7 +2,6 @@ module.exports = ({ utils }) => {
   const { math } = utils;
   return function getTotal(item) {
     if (!item || !item.subTotals) return 0;
-
-    return math.add(item.subTotals._simple, item.subTotals._xincluded);
+    return math.add(item.subTotals._actual, item.subTotals._xincluded);
   };
 };

package/lib/item/getTotals.js

@@ -16,15 +16,17 @@ module.exports = ({ utils }) => {
       }
     }
 
-    const total = Object.keys(subTotals).reduce(
-      (acc, key) => math.add(acc, subTotals[key]),
-      subTotal
+    const total = math.toDecimalPlaces(
+      Object.keys(subTotals).reduce(
+        (acc, key) => math.add(acc, subTotals[key]),
+        subTotal
+      )
     );
 
     subTotals = Object.keys(subTotals).reduce(
       (acc, key) => ({
         ...acc,
-        [key]: subTotals[key],
+        [key]: math.toDecimalPlaces(subTotals[key]),
       }),
       {}
     );

package/lib/modifier/calculate.js

@@ -1,13 +1,13 @@
 /**
  * Get calculated modifier
  */
- module.exports = ({ _, constants, utils, localization, actions }) => {
+module.exports = ({ _, constants, utils, localization, actions }) => {
   const { math } = utils;
   const { Modifier } = constants;
 
   return function calculate(
     modifier = {},
-    options = { price: 0, skip: false }
+    options = { price: 0, quantity: 0, skip: false }
   ) {
     const { name, compute } = modifier;
     const { type, action, amount = 0 } = compute || {};
@@ -15,8 +15,16 @@
       amount: 0,
       description: '',
     };
-    const maxAmount = actions.getProperty(modifier, 'maxAmount');
+
+    const maxAmountProp = actions.getProperty(modifier, 'maxAmount');
+
     if (!options.skip) {
+      const maxAmountCalc = math.mul(options.price, options.quantity);
+
+      const maxAmount = maxAmountProp
+        ? math.min(maxAmountProp, maxAmountCalc)
+        : maxAmountCalc;
+
       const multiplier = action === Modifier.Compute.Actions.SUBTRACT ? -1 : 1;
 
       if (type === Modifier.Compute.Types.FIXED)
@@ -24,15 +32,16 @@
 
       if (type === Modifier.Compute.Types.PERCENTAGE)
         _computed.amount = math.div(
-          math.mul(multiplier, options.price, amount),
+          math.mul(multiplier, options.price, options.quantity, amount),
           100
         );
 
       if (!type || action === Modifier.Compute.Actions.OVERRIDE)
         _computed.amount = 0;
 
-      if (maxAmount && math.gt(math.abs(_computed.amount), maxAmount))
-        _computed.amount = maxAmount;
+      if (math.gt(math.abs(_computed.amount), maxAmount)) {
+        _computed.amount = maxAmount * multiplier;
+      }
     }
 
     const localAmount = localization.formatAmount(_computed.amount);

package/lib/modifier/createIndirectModifier.js

@@ -17,7 +17,10 @@ module.exports = ({ _, utils, constants, actions }) => {
 
     if (type === Modifier.Compute.Types.PERCENTAGE) {
       const modifierAmountByPercentage = math.div(
-        math.mul(options.orderTotal, amount),
+        math.mul(
+          modifier.type === 'credit' ? options.orderTotal : options.itemTotal,
+          amount
+        ),
         100
       );
       modifierAmount =
@@ -26,14 +29,18 @@ module.exports = ({ _, utils, constants, actions }) => {
           : modifierAmountByPercentage;
     }
 
-    let amountToApply = 0;
+    let amountToApply = modifierAmount;
 
-    if (!math.isZero(options.orderTotal))
+    if (
+      !math.isZero(options.orderTotal) &&
+      (type !== Modifier.Compute.Types.PERCENTAGE || modifier.type === 'credit')
+    ) {
       amountToApply = math.div(
         math.mul(modifierAmount, options.itemTotal),
         options.orderTotal,
         options.itemQuantity
       );
+    }
 
     const modifierToAdd = actions.create({
       ..._.cloneDeep(modifier),
@@ -43,6 +50,12 @@ module.exports = ({ _, utils, constants, actions }) => {
         amount: amountToApply,
         action: compute.action || Modifier.Compute.Actions.SUBTRACT,
       },
+      properties: {
+        ignoreQuantity:
+          (modifier.properties && modifier.properties.ignoreQuantity) ||
+          type === Modifier.Compute.Types.PERCENTAGE,
+        ...(modifier.properties || {}),
+      },
     });
     if (maxAmount !== null) delete modifierToAdd.properties.maxAmount;
 

package/lib/modifier/getSplittedModifiers.js

@@ -7,9 +7,11 @@ module.exports = ({ utils }) => {
     totalSplitedOrder,
   }) =>
     totalOriginOrder
-      ? math.div(
-          math.mul(modifierAmount, totalSplitedOrder || 0),
-          totalOriginOrder
+      ? math.toDecimalPlaces(
+          math.div(
+            math.mul(modifierAmount, totalSplitedOrder || 0),
+            totalOriginOrder
+          )
         )
       : 0;
 

package/lib/order/getTotals.js

@@ -17,6 +17,7 @@ module.exports = ({ utils }) => {
                 orderSubTotals[key]
               );
           }
+
           return {
             total: math.add(acc.total, order.total),
             subTotals,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -19,7 +19,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@darkpos/utils": "1.0.8",
+    "@darkpos/utils": "1.0.9",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.34"
   },
@@ -36,5 +36,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "82cfaf282b53da5c4343a36daad7e7d16fe4aa2c"
+  "gitHead": "a5c31d32fc9c21bc3d643d02e1171438b38f6826"
 }