@darkpos/pricing 1.0.70 → 1.0.71

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/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/package.json

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