@darkpos/pricing 1.0.70 → 1.0.72

package/__TEST__/item/getModifierTags.test.js

@@ -356,12 +356,11 @@ describe('getModifierTags Function', () => {
 
     const result = pricingServiceGroupModifiers.item.getModifierTags({ item });
 
-    expect(result).toHaveLength(3);
-    expect(result[0].label.replace(/\s/g, '')).toEqual('1White');
-    expect(result[1].label.replace(/\s/g, '')).toEqual(
+    expect(result).toHaveLength(2);
+    expect(result[0].label.replace(/\s/g, '')).toEqual(
       '1CRC5.10discount(-CRC5.10)'
     );
-    expect(result[2].label.replace(/\s/g, '')).toEqual(
+    expect(result[1].label.replace(/\s/g, '')).toEqual(
       '1CRC37.50discount(-CRC37.50)'
     );
   });

package/__TEST__/modifier/getInvalidRequiredModifiers.test.js

@@ -3849,6 +3849,8 @@ test('getInvalidRequiredModifiers  having related items', () => {
         delModifiers: [],
       },
     ],
+    _id: '67dc63610c106ab7d481d7dd',
+    itemId: '62cdbfd01ee1b4001932821a',
   };
   const otherItems = [
     {
@@ -3860,13 +3862,14 @@ test('getInvalidRequiredModifiers  having related items', () => {
         parentId: '67dc63610c106ab7d481d7dd',
         includeParent: true,
         basePrice: 3,
+        relatedItemId: '62cdbfd01ee1b4001932820e',
       },
     },
   ];
 
   const response = pricingService.item.getInvalidRequiredModifiers({
     item,
-    otherItems,
+    relatedItems: otherItems,
   });
 
   expect(response.length).toBe(1);

package/__TEST__/modifier/hasModifier.test.js

@@ -1651,7 +1651,13 @@ describe('hasModifier Function', () => {
       },
     };
 
-    const item = { _id: 1, itemId: 'ab', modifiers: [groupMod] };
+    const item = {
+      _id: 1,
+      itemId: 'ab',
+      modifiers: [groupMod],
+      price: 500,
+      total: 10000,
+    };
 
     const order = {
       items: [item],
@@ -1683,6 +1689,25 @@ describe('hasModifier Function', () => {
 
     expect(updatedOrder.items.length).toBe(2);
 
+    expect(updatedOrder.items[1]).toMatchObject({
+      _id: 1,
+      itemId: 'ab',
+      modifiers: [
+        {
+          _id: 'groupMod10',
+          attributes: ['group'],
+          properties: {
+            group: {
+              items: [{ _id: 'abc', name: 'related item abc', itemId: 'abc' }],
+              modifiers: [{ _id: '123', name: 'related mod' }],
+            },
+          },
+        },
+      ],
+      price: 500,
+      total: 10000,
+    });
+
     const result = pricingService.item.hasModifier({
       item: updatedOrder.items[1],
       modifier: groupMod,
@@ -1693,5 +1718,47 @@ describe('hasModifier Function', () => {
     });
 
     expect(result).toBe(true);
+
+    const { updatedOrder: updatedOrder2 } = pricingService.order.addItem({
+      order,
+      item: {
+        ...relatedModItem,
+        properties: {
+          relatedItem: true,
+          parentItemId: item.itemId,
+          parentId: item._id,
+          includeParent: false,
+          relatedItemId: relatedModItem._id,
+        },
+      },
+    });
+
+    expect(updatedOrder2.items.length).toBe(2);
+
+    expect(updatedOrder2.items[1]).toMatchObject({
+      _id: 1,
+      itemId: 'ab',
+      modifiers: [],
+      price: 0,
+      total: 0,
+      subTotals: {
+        _included: 0,
+        _xincluded: 0,
+        _direct: 0,
+        _xdirect: 0,
+        _actual: 0,
+      },
+    });
+
+    const result2 = pricingService.item.hasModifier({
+      item: updatedOrder2.items[1],
+      modifier: groupMod,
+      relatedItems: pricingService.order.getRelatedItems({
+        order: updatedOrder2,
+        item: updatedOrder2.items[1],
+      }),
+    });
+
+    expect(result2).toBe(true);
   });
 });

package/lib/item/getInvalidRequiredModifiers.js

@@ -1,5 +1,5 @@
 module.exports = ({ modifierActions, actions }) =>
-  function getInvalidRequiredModifiers({ item, otherItems }) {
+  function getInvalidRequiredModifiers({ item, relatedItems }) {
     if (!item || !Array.isArray(item.modifiers)) return [];
     const invalidModifiers = [];
 
@@ -7,23 +7,7 @@ module.exports = ({ modifierActions, actions }) =>
       if (
         modifierActions.isRequired(modifier) &&
         modifierActions.isGroupOfModifiers(modifier) &&
-        !item.modifiers
-          .filter(mod => mod._id !== modifier._id)
-          .some(itemModifier =>
-            modifierActions.isRelatedModifier({
-              _id: itemModifier.modifierId || itemModifier._id,
-              modifier,
-            })
-          ) &&
-        Array.isArray(otherItems) &&
-        modifierActions.isGroupOfItems(modifier) &&
-        !modifier.properties.group.items.some(relatedItem =>
-          otherItems.some(
-            otherItem =>
-              actions.isRelatedItem(otherItem) &&
-              otherItem.itemId === relatedItem._id
-          )
-        )
+        !actions.hasModifier({ item, modifier, relatedItems })
       ) {
         invalidModifiers.push(modifier);
       }

package/lib/item/getModifierTags.js

@@ -6,7 +6,11 @@ module.exports = ({ modifierActions, settings }) =>
     if (!item || !Array.isArray(item.modifiers)) return [];
 
     let modifierTags = item.modifiers
-      .filter(each => modifierActions.isValid(each))
+      .filter(
+        each =>
+          modifierActions.isValid(each) &&
+          (!modifierActions.isGroup(each) || modifierActions.isDepartment(each))
+      )
       .map(modifier => {
         const { name, _id } = modifier;
 

package/lib/modifier/isGroupOfModifiers.js

@@ -6,7 +6,8 @@ module.exports = ({ actions, constants }) => {
       actions.hasAttribute(modifier, Modifier.Attributes.GROUP) &&
       properties &&
       properties.group &&
-      (properties.group.modifiers || []).length
+      ((properties.group.modifiers || []).length ||
+        !!properties.group.manualModifiers)
     );
   };
 };

package/lib/order/addItem.js

@@ -168,8 +168,8 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
         if (!_.isEmpty(inheritedModifiers))
           modifiersToAdd.push(...inheritedModifiers);
         // Remove parent if it is only a repair Item
-        if (!itemActions.isParentIncluded(orderItem)) {
-          order = actions.removeItem({ order, item: parent });
+        if (!itemActions.isParentIncluded(orderItem) && !!parent) {
+          order = actions.resetItem({ order, item: parent });
         }
       }
     }
@@ -249,7 +249,11 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
       nextOrder.items.splice(idxToRemove, 1);
     }
 
-    if (itemActions.isRelatedItem(item) && itemActions.hasAddModifiers(item)) {
+    if (
+      itemActions.isRelatedItem(item) &&
+      itemActions.hasAddModifiers(item) &&
+      itemActions.isParentIncluded(item)
+    ) {
       const parentItem = itemActions.getParentItem(nextOrder.items, item);
       const parentIndex = actions.getItemIndex({
         order: nextOrder,

package/lib/order/index.js

@@ -88,6 +88,7 @@ const applyPayment = require('./applyPayment');
 const getBalance = require('./getBalance');
 const getLastLocation = require('./getLastLocation');
 const getModifierRelations = require('./getModifierRelations');
+const resetItem = require('./resetItem');
 
 const orderActions = (deps = {}) => {
   const actions = {};
@@ -187,6 +188,7 @@ const orderActions = (deps = {}) => {
     getOrdersBalance: getOrdersBalance(innerDeps),
     getLastLocation: getLastLocation(innerDeps),
     getModifierRelations: getModifierRelations(innerDeps),
+    resetItem: resetItem(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/order/resetItem.js

@@ -0,0 +1,25 @@
+module.exports = ({ itemActions }) =>
+  function resetItem({ item, order }) {
+    if (!item) return undefined;
+
+    const itemReset = itemActions.calculate(
+      {
+        ...item,
+        price: 0,
+        modifiers: [],
+      },
+      {}
+    );
+
+    const nextItems = order.items;
+    const parentIndex = order.items.findIndex(
+      eachItem => eachItem._id === itemReset._id
+    );
+
+    nextItems.splice(parentIndex, 1, itemReset);
+
+    return {
+      ...order,
+      items: nextItems,
+    };
+  };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.70",
+  "version": "1.0.72",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -49,5 +49,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "10feaa2937e3a57ac591a3174c3fd936f061d524"
+  "gitHead": "2dc88094c2dbcebc04e0fbd817b45809a44dc403"
 }