@darkpos/pricing 1.0.53 → 1.0.55

package/lib/item/index.js

@@ -46,6 +46,7 @@ const getTotalsDifference = require('./getTotalsDifference');
 const getTotalNeareastDifference = require('./getTotalNeareastDifference');
 const getNoteTags = require('./getNoteTags');
 const getBasePrice = require('./getBasePrice');
+const removeModifiersByQuantity = require('./removeModifiersByQuantity');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -105,6 +106,7 @@ const itemActions = (deps = {}) => {
     getTotalNeareastDifference: getTotalNeareastDifference(innerDeps),
     getNoteTags: getNoteTags(innerDeps),
     getBasePrice: getBasePrice(innerDeps),
+    removeModifiersByQuantity: removeModifiersByQuantity(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/item/removeModifiersByQuantity.js

@@ -0,0 +1,30 @@
+module.exports = ({ modifierActions }) =>
+  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) ||
+          !modifier.modifierId ||
+          !modifierActions.isDirect(modifier)
+        )
+          return true;
+
+        const count = modifierCounts[modifier.modifierId] || 0;
+
+        if (count < item.quantity) {
+          modifierCounts[modifier.modifierId] = count + 1;
+          return true;
+        }
+
+        return false;
+      }),
+    };
+  };

package/lib/modifier/calculate.js

@@ -14,12 +14,14 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
     const modifier = _modifier;
     const { name } = modifier;
     const compute = getComputeModField(modifier);
-    const { type, action, amount = 0 } = compute;
+    const { type, amount: computeAmount = 0 } = compute;
     const _computed = {
       amount: 0,
       description: '',
     };
 
+    const amount = computeAmount;
+
     const maxAmountProp = actions.getProperty(modifier, 'maxAmount');
 
     if (!options.skip) {
@@ -32,22 +34,41 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
         ? math.min(maxAmountProp, maxAmountCalc)
         : maxAmountCalc;
 
-      const multiplier = action === Modifier.Compute.Actions.SUBTRACT ? -1 : 1;
+      const multiplier = actions.isSubtract(_modifier) ? -1 : 1;
 
-      if (type === Modifier.Compute.Types.FIXED)
+      if (type === Modifier.Compute.Types.FIXED) {
         _computed.amount = math.mul(multiplier, amount);
+      }
 
-      if (type === Modifier.Compute.Types.PERCENTAGE)
+      if (type === Modifier.Compute.Types.PERCENTAGE) {
         _computed.amount = math.div(
-          math.mul(multiplier, options.price, options.quantity, amount),
+          math.mul(multiplier, options.price, amount),
           100
         );
+      }
 
       if (!type) _computed.amount = 0;
 
       if (math.gt(math.abs(_computed.amount), maxAmount)) {
         _computed.amount = maxAmount * multiplier;
       }
+
+      if (
+        (!actions.isOverride(_modifier) &&
+          actions.isQuantityMultiplier(_modifier)) ||
+        (actions.isAmountOverride(_modifier) && actions.isMultiplier(_modifier))
+      ) {
+        _computed.amount = math.mul(_computed.amount, options.quantity);
+      }
+
+      if (
+        actions.isSubtract(_modifier) &&
+        typeof _computed.amount === 'number' &&
+        typeof options.maxDiscountAmount === 'number' &&
+        math.gt(math.abs(_computed.amount), options.maxDiscountAmount)
+      ) {
+        _computed.amount = math.mul(options.maxDiscountAmount, -1);
+      }
     }
 
     const localAmount =
@@ -71,7 +92,7 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
 
     if (actions.isAmountOverride(modifier) && isMultiplier) {
       _computed.description = `${name} (${localization.formatAmount(
-        math.mul(_computed.amount, options.quantity)
+        _computed.amount
       )})`;
     }
 

package/lib/modifier/createFeeModifier.js

@@ -19,7 +19,7 @@ module.exports = ({ constants, actions, localization }) => {
       type: Modifier.Types.FEE,
       name: `${name} ${Modifier.Types.FEE}`,
       properties: {
-        ignoreQuantity: true,
+        isQuantityMultiplier: false,
         ...properties,
       },
       ...rest,

package/lib/modifier/createIndirectModifier.js

@@ -36,10 +36,9 @@ module.exports = ({ _, utils, constants, actions }) => {
       !math.isZero(options.orderTotal) &&
       (type !== Modifier.Compute.Types.PERCENTAGE || modifier.type === 'credit')
     ) {
-      const modififierQuantity =
-        modifier.properties && modifier.properties.ignoreQuantity
-          ? 1
-          : options.itemQuantity;
+      const modififierQuantity = !actions.isQuantityMultiplier(modifier)
+        ? 1
+        : options.itemQuantity;
 
       amountToApply = math.div(
         math.mul(modifierAmount, options.itemTotal),
@@ -57,10 +56,10 @@ module.exports = ({ _, utils, constants, actions }) => {
         action: compute.action || Modifier.Compute.Actions.SUBTRACT,
       },
       properties: {
-        ignoreQuantity:
-          (modifier.properties && modifier.properties.ignoreQuantity) ||
-          type === Modifier.Compute.Types.PERCENTAGE,
         ...(modifier.properties || {}),
+        isQuantityMultiplier:
+          type !== Modifier.Compute.Types.PERCENTAGE &&
+          actions.isQuantityMultiplier(modifier),
       },
     });
     if (maxAmount !== null) delete modifierToAdd.properties.maxAmount;

package/lib/modifier/index.js

@@ -103,7 +103,6 @@ const isAmountOverride = require('./isAmountOverride');
 const isValid = require('./isValid');
 const isDiscount = require('./isDiscount');
 const isHidden = require('./isHidden');
-const isIgnoreQuantity = require('./isIgnoreQuantity');
 const isGratuity = require('./isGratuity');
 const isPaymentMethodModifier = require('./isPaymentMethodModifier');
 const isPaymentTypeModifier = require('./isPaymentTypeModifier');
@@ -148,6 +147,9 @@ const isExtractCalculatedValue = require('./isExtractCalculatedValue');
 const getPriceWithoutModifier = require('./getPriceWithoutModifier');
 const isGroup = require('./isGroup');
 const isOptionsSelectedOverride = require('./isOptionsSelectedOverride');
+const isFixedSubtract = require('./isFixedSubtract');
+const isQuantityMultiplier = require('./isQuantityMultiplier');
+const isCompute = require('./isCompute');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -262,7 +264,6 @@ const modifierActions = (deps = {}) => {
     isValid: isValid(innerDeps),
     isDiscount: isDiscount(innerDeps),
     isHidden: isHidden(innerDeps),
-    isIgnoreQuantity: isIgnoreQuantity(innerDeps),
     isGratuity: isGratuity(innerDeps),
     isPaymentMethodModifier: isPaymentMethodModifier(innerDeps),
     isPaymentTypeModifier: isPaymentTypeModifier(innerDeps),
@@ -309,6 +310,9 @@ const modifierActions = (deps = {}) => {
     getPriceWithoutModifier: getPriceWithoutModifier(innerDeps),
     isGroup: isGroup(innerDeps),
     isOptionsSelectedOverride: isOptionsSelectedOverride(innerDeps),
+    isFixedSubtract: isFixedSubtract(innerDeps),
+    isQuantityMultiplier: isQuantityMultiplier(innerDeps),
+    isCompute: isCompute(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/isCompute.js

@@ -0,0 +1,10 @@
+module.exports = () =>
+  function isCompute(modifier) {
+    if (!modifier || !modifier.compute) return false;
+
+    return (
+      !!modifier.compute.action &&
+      !!modifier.compute.type &&
+      typeof modifier.compute.amount === 'number'
+    );
+  };

package/lib/modifier/isFixedSubtract.js

@@ -0,0 +1,4 @@
+module.exports = ({ actions }) =>
+  function isFixedSubtract(modifier) {
+    return actions.isSubtract(modifier) && actions.isFixed(modifier);
+  };

package/lib/modifier/isQuantityMultiplier.js

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

package/lib/order/addItemModifier.js

@@ -177,6 +177,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     itemIndex,
     cache,
     onConditionsNotMet,
+    onError,
   }) {
     let order = _.cloneDeep(orderProp);
     if (!order || itemIndex < 0 || !modifier) return order;
@@ -223,6 +224,16 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       return order;
     }
 
+    if (
+      contains &&
+      modifierActions.isCompute(modifier) &&
+      !modifierActions.isQuantityMultiplier(modifier)
+    ) {
+      if (onError)
+        onError('modifier.has.reached.the.maximum.amount.of.applies');
+      return order;
+    }
+
     item = addModifier({
       item,
       modifier,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.53",
+  "version": "1.0.55",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -19,6 +19,8 @@
     "test:item": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/item.test.js",
     "test:split": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/split.test.js",
     "test:getModifierTags": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/item/getModifierTags.test.js",
+    "test:createIndirectModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/createIndirectModifier.test.js",
+    "test:conditionsNotMet": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/conditionsNotMet.test.js",
     "lint": "eslint --quiet lib/"
   },
   "publishConfig": {
@@ -42,5 +44,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "ad5528b8430430e2a34e124218dc4ac1d3da1681"
+  "gitHead": "4341a5b5f555e6148a83ba4dba73bb7c908a02f5"
 }

package/__TEST__/mocks/scripts/calculate-partially-paid/index.js

@@ -1,27 +0,0 @@
-const usePricing = require('../../../../index');
-
-const orderToStr = require('../order-to-string');
-
-const orderPartiallyPaid = require('../../partially-paid/order-partially-paid.json');
-const orderModifiers = require('../../partially-paid/order-modifiers.json');
-const inputItems = require('../../partially-paid/input-items.json');
-
-const pricingService = usePricing();
-
-const paymentModifiers = orderModifiers.map(orderMod =>
-  pricingService.modifier.duplicate({
-    orderMod,
-    items: inputItems,
-  })
-);
-
-let order = { ...orderPartiallyPaid };
-
-order = pricingService.order.addModifiers({
-  modifiers: paymentModifiers,
-  order,
-});
-
-const resultedOrder = pricingService.order.calculate(order);
-
-orderToStr(resultedOrder);

package/__TEST__/mocks/scripts/calculate-unpaid/index.js

@@ -1,28 +0,0 @@
-const usePricing = require('../../../../index');
-
-const orderToStr = require('../order-to-string');
-
-const orderUnpaid = require('../../unpaid/order-not-paid.json');
-const orderModifiers = require('../../unpaid/order-modifiers.json');
-const inputItems = require('../../unpaid/input-items.json');
-
-const pricingService = usePricing();
-
-const paymentModifiers = orderModifiers.map(orderMod =>
-  pricingService.modifier.duplicate({
-    ...orderMod,
-    items: inputItems,
-  })
-);
-
-let order = { ...orderUnpaid };
-
-if (paymentModifiers.length > 0)
-  order = pricingService.order.addModifiers({
-    modifiers: paymentModifiers,
-    order,
-  });
-
-const resultedOrder = pricingService.order.calculate(order);
-
-orderToStr(resultedOrder);

package/__TEST__/mocks/scripts/order-to-string.js

@@ -1,18 +0,0 @@
-module.exports = function orderToString(order) {
-  const { total, totalPaid, items } = order;
-
-  console.log({ total, totalPaid });
-  items.map(item => {
-    console.log('****');
-    console.log({
-      name: item.name,
-      price: item.price,
-      total: item.total,
-      totalPaid: item.totalPaid,
-      subtotals: item.subTotals,
-    });
-    item.modifiers.map(mod => {
-      console.log('modifier _computed', mod._computed);
-    });
-  });
-};

package/lib/modifier/isIgnoreQuantity.js

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