@darkpos/pricing 1.0.56 → 1.0.58

package/__TEST__/modifier.test.js

@@ -74,6 +74,64 @@ describe('Modifier actions', () => {
       },
     });
 
+    expect(conditionsBag).toEqual([]);
+    expect(error).toEqual('');
+
+    expect(updatedOrder2.items[0].modifiers.length).toEqual(2);
+  });
+
+  test('CU-86dve27tq Should not allow adding a modifier more than once to an item if isQuantityMultiplier={true} QTY={2}', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+    };
+    const modifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        action: 'subtract',
+        type: 'fixed',
+      },
+      properties: {
+        isQuantityMultiplier: true,
+      },
+    };
+    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);

package/lib/modifier/index.js

@@ -150,6 +150,7 @@ const isOptionsSelectedOverride = require('./isOptionsSelectedOverride');
 const isFixedSubtract = require('./isFixedSubtract');
 const isQuantityMultiplier = require('./isQuantityMultiplier');
 const isCompute = require('./isCompute');
+const isFixedOverride = require('./isFixedOverride');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -313,6 +314,7 @@ const modifierActions = (deps = {}) => {
     isFixedSubtract: isFixedSubtract(innerDeps),
     isQuantityMultiplier: isQuantityMultiplier(innerDeps),
     isCompute: isCompute(innerDeps),
+    isFixedOverride: isFixedOverride(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/isFixedOverride.js

@@ -0,0 +1,9 @@
+module.exports = () =>
+  function isFixedOverride(modifier) {
+    return !!(
+      modifier &&
+      modifier.properties &&
+      modifier.properties.override &&
+      modifier.properties.override.type === 'fixed'
+    );
+  };

package/lib/order/addItemModifier.js

@@ -227,7 +227,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     if (
       contains &&
       modifierActions.isCompute(modifier) &&
-      !modifierActions.isQuantityMultiplier(modifier)
+      modifierActions.isQuantityMultiplier(modifier)
     ) {
       if (onError)
         onError('modifier.has.reached.the.maximum.amount.of.applies');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -45,5 +45,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "41b3ae5dcaec11195920c3b5f0a97b34b3982815"
+  "gitHead": "44545d8746f8adb06ebe4d8b87edc6ae0f0f4406"
 }