@darkpos/pricing 1.0.54 → 1.0.55

package/__TEST__/modifier.test.js

@@ -24,4 +24,116 @@ describe('Modifier actions', () => {
       })
     ).toBe(false);
   });
+
+  test('CU-86dve27tq Should not allow adding a modifier more than once to an item if isQuantityMultiplier={false} QTY={2}', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+    };
+    const modifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        action: 'subtract',
+        type: 'fixed',
+      },
+    };
+    order.items.push({
+      quantity: 2,
+      itemId: '123',
+      price: 100,
+      modifiers: [],
+    });
+
+    const conditionsBag = [];
+
+    const updatedOrder = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+      onConditionsNotMet: bag => {
+        bag.forEach(condition => {
+          conditionsBag.push(condition);
+        });
+      },
+    });
+
+    let error = '';
+    const updatedOrder2 = pricingService.order.addItemModifier({
+      order: { ...updatedOrder },
+      modifier,
+      itemIndex: 0,
+      onConditionsNotMet: bag => {
+        bag.forEach(condition => {
+          conditionsBag.push(condition);
+        });
+      },
+      onError: errorMessage => {
+        error = errorMessage;
+      },
+    });
+
+    expect(conditionsBag).toEqual([]);
+    expect(error).toEqual('modifier.has.reached.the.maximum.amount.of.applies');
+    expect(updatedOrder2).toEqual(updatedOrder);
+  });
+
+  test('CU-86dve27tq Should not allow adding a modifier more than once to an item if isQuantityMultiplier={false} QTY={1}', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+    };
+    const modifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        action: 'subtract',
+        type: 'fixed',
+      },
+    };
+    order.items.push({
+      quantity: 1,
+      itemId: '123',
+      price: 100,
+      modifiers: [],
+      properties: {
+        basePrice: 100,
+      },
+    });
+
+    const conditionsBag = [];
+
+    const updatedOrder = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+      onConditionsNotMet: bag => {
+        bag.forEach(condition => {
+          conditionsBag.push(condition);
+        });
+      },
+    });
+
+    let error = '';
+    const updatedOrder2 = pricingService.order.addItemModifier({
+      order: { ...updatedOrder },
+      modifier,
+      itemIndex: 0,
+      onConditionsNotMet: bag => {
+        bag.forEach(condition => {
+          conditionsBag.push(condition);
+        });
+      },
+      onError: errorMessage => {
+        error = errorMessage;
+      },
+      cache: { items: [], modifiers: [] },
+    });
+
+    expect(conditionsBag).toEqual([]);
+    expect(error).toEqual('');
+    expect(updatedOrder2).toEqual(order);
+  });
 });

package/lib/item/calculate.js

@@ -29,7 +29,8 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
     subTotals._simple = math.mul(price, quantity);
 
     const modifiers = [];
-    const { modifiers: itemModifiers = [] } = item;
+    const { modifiers: itemModifiers = [] } =
+      actions.removeModifiersByQuantity(item);
 
     const validatedModifiers = itemModifiers.map(each =>
       modifierActions.validate(each, {

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/index.js

@@ -149,6 +149,7 @@ 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 = {};
@@ -311,6 +312,7 @@ const modifierActions = (deps = {}) => {
     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/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.54",
+  "version": "1.0.55",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -20,6 +20,7 @@
     "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": {
@@ -43,5 +44,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "8bba2c9f52f54528ea2d0dece82406ef9fe69cb3"
+  "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);
-    });
-  });
-};