@darkpos/pricing 1.0.135 → 1.0.137

package/__TEST__/modifier/getMatchTagsModifiers.test.js

@@ -58,7 +58,7 @@ describe('GetMatchTagsModifiers Function', () => {
         modifiers,
         entity: customer,
       })
-    ).toHaveLength(0);
+    ).toHaveLength(1);
     modifiers = [{ tags: ['test'] }];
     expect(
       pricingService.modifier.getMatchTagsModifiers({
@@ -79,7 +79,7 @@ describe('GetMatchTagsModifiers Function', () => {
         modifiers,
         entity: customer,
       })
-    ).toHaveLength(1);
+    ).toHaveLength(2);
     modifiers = [
       { tags: ['all'] },
       { tags: ['test'] },
@@ -91,7 +91,7 @@ describe('GetMatchTagsModifiers Function', () => {
         modifiers,
         entity: customer,
       })
-    ).toHaveLength(1);
+    ).toHaveLength(2);
     modifiers = [
       { tags: ['all'] },
       { tags: ['test'] },
@@ -104,7 +104,7 @@ describe('GetMatchTagsModifiers Function', () => {
         modifiers,
         entity: customer,
       })
-    ).toHaveLength(2);
+    ).toHaveLength(3);
     modifiers = [{ tags: ['all'] }];
     expect(
       pricingService.modifier.getMatchTagsModifiers({
@@ -130,7 +130,7 @@ describe('GetMatchTagsModifiers Function', () => {
         modifiers,
         entity: customer,
       })
-    ).toHaveLength(2);
+    ).toHaveLength(3);
     customer.tags = ['all'];
     expect(
       pricingService.modifier.getMatchTagsModifiers({
@@ -158,6 +158,6 @@ describe('GetMatchTagsModifiers Function', () => {
         modifiers,
         entity: customer,
       })
-    ).toHaveLength(5);
+    ).toHaveLength(6);
   });
 });

package/__TEST__/modifier/hasMatchTags.test.js

@@ -31,9 +31,9 @@ describe('Has Match Tags Function', () => {
     );
     customer.tags = ['test'];
     modifier.tags = ['test'];
-    expect(pricingService.modifier.hasMatchTags(customer)).toBe(false);
+    expect(pricingService.modifier.hasMatchTags(customer)).toBe(true);
     expect(pricingService.modifier.hasMatchTags(undefined, modifier)).toBe(
-      false
+      true
     );
     customer.tags = ['test'];
     modifier.tags = ['all'];

package/__TEST__/order/order.test.js

@@ -3014,7 +3014,12 @@ describe('Order actions', () => {
           _id: 1,
           price: 10,
           quantity: 2,
-          modifiers: [],
+          modifiers: [
+            {
+              name: 'modi-vip',
+              tags: ['vip'],
+            },
+          ],
         },
       ],
       customer: {

package/lib/modifier/hasMatchTags.js

@@ -1,25 +1,8 @@
 module.exports = ({ actions }) =>
-  /* checks if the customer can be matched with the entity or not,
-   * This function will return true in these conditions:
-   *    Neither customer nor the entity has any tags
-   *    Customer has no tags and entity has the 'all' tag
-   *    customer has the 'all' tag and entity has no tags
-   *    customer and entity have at least one exact tag (case-sensitive)
-   * In any other case the function should return false
-   * */
   function hasMatchTags(modifier, entity) {
     const entityNoTags = actions.hasNoTags(entity);
     const modifierNoTags = actions.hasNoTags(modifier);
-    if (
-      (modifierNoTags && entityNoTags) ||
-      (entityNoTags && actions.hasAllTag(modifier)) || // customer has no tags but modifier has the all tag
-      (modifierNoTags && actions.hasAllTag(entity)) // modifier has no tags but customer has the all tag
-    ) {
-      return true;
-    }
-
-    if (!entity || !entity.tags) return false;
-    if (!modifier || !modifier.tags) return false;
+    if (modifierNoTags || entityNoTags) return true;
 
     const sameTag = modifier.tags.find(tag => entity.tags.includes(tag));
 

package/lib/order/createSubOrder.js

@@ -23,7 +23,7 @@ module.exports = ({ actions, settings, _ }) => {
       ...rest,
       parentId: orderSettings.allowSuborder ? _id : null,
       status: {
-        order: 'open',
+        order: status.order || 'open',
         delivery: status.delivery || false,
         detailed: status.detailed || false,
         paid: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.135",
+  "version": "1.0.137",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -52,5 +52,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "2ccf91f622bdc8de4548a2670d4a7293d335367e"
+  "gitHead": "3682dadc4e1f7231918dc3e3a4581a46c41cd8b2"
 }