@darkpos/pricing 1.0.84 → 1.0.85

package/__TEST__/modifier.test.js

@@ -1855,4 +1855,74 @@ describe('Modifier actions', () => {
 
     expect(updatedOrder2.items[0].modifiers.length).toEqual(1);
   });
+
+  test('Should not add modifiers if tags do not match', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+    };
+    const modifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        action: 'subtract',
+        type: 'fixed',
+      },
+      tags: ['tagA', 'tagB'],
+    };
+    order.items.push({
+      quantity: 2,
+      itemId: '123',
+      price: 100,
+      modifiers: [],
+      tags: ['otherTag'],
+    });
+
+    const updatedOrder = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+    });
+
+    expect(updatedOrder.items[0].modifiers.length).toEqual(0);
+  });
+
+  test('Should add modifier if tags match', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+    };
+    const modifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        action: 'subtract',
+        type: 'fixed',
+      },
+      tags: ['tagA', 'tagB'],
+    };
+    order.items.push({
+      quantity: 2,
+      itemId: '123',
+      price: 100,
+      modifiers: [],
+      tags: ['tagA'],
+    });
+
+    let error = '';
+    const updatedOrder = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+      onError: err => {
+        error = err;
+      },
+    });
+
+    expect(error).toEqual('');
+
+    expect(updatedOrder.items[0].modifiers.length).toEqual(1);
+  });
 });

package/lib/item/index.js

@@ -59,6 +59,7 @@ const adjustFixedModifiersDifference = require('./adjustFixedModifiersDifference
 const validateCreditModifiersTotal = require('./validateCreditModifiersTotal');
 const adjustCreditModifiersDifference = require('./adjustCreditModifiersDifference');
 const getSubtotal = require('./getSubtotal');
+const isSomeTagsMatch = require('./isSomeTagsMatch');
 const getTotals = require('./getTotals');
 const patchItem = require('./patchItem');
 
@@ -133,6 +134,7 @@ const itemActions = (deps = {}) => {
     validateCreditModifiersTotal: validateCreditModifiersTotal(innerDeps),
     adjustCreditModifiersDifference: adjustCreditModifiersDifference(innerDeps),
     getSubtotal: getSubtotal(innerDeps),
+    isSomeTagsMatch: isSomeTagsMatch(innerDeps),
     getTotals: getTotals(innerDeps),
     patchItem: patchItem(innerDeps),
   });

package/lib/item/isSomeTagsMatch.js

@@ -0,0 +1,13 @@
+module.exports = () =>
+  function isSomeTagsMatch({ item, tags }) {
+    if (
+      !item ||
+      !Array.isArray(item.tags) ||
+      item.tags.length === 0 ||
+      !Array.isArray(tags) ||
+      tags.length === 0
+    )
+      return true;
+
+    return item.tags.some(tag => tags.includes(tag));
+  };

package/lib/order/addItemModifier.js

@@ -180,6 +180,11 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     if (!order || itemIndex < 0 || !modifier) return order;
 
     let item = actions.getSelectedItem({ order, itemIndex });
+
+    if (!itemActions.isSomeTagsMatch({ item, tags: modifier.tags })) {
+      return order;
+    }
+
     const customer = actions.getCustomer(order);
     const contains =
       !_.isEmpty(item.modifiers) &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.84",
+  "version": "1.0.85",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -51,5 +51,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "d15a98cdefcf27cdaf41a8096a6c6c7dcdfcc13f"
+  "gitHead": "275e9dcadc8bca5f47d4c444685c154f998d2862"
 }