@darkpos/pricing 1.0.69 → 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/__TEST__/order/order.test.js

@@ -3234,4 +3234,469 @@ describe('Order actions', () => {
     };
     expect(pricingService.order.getLastLocation({ status })).toEqual(null);
   });
+
+  test('should autoSplit. Department has maxPieces6', () => {
+    const deparmentModifier = {
+      modifierId: '67e5b5faa8b435351f4c60b3',
+      _parentId: null,
+      locked: false,
+      name: 'DepMax6Pieces',
+      sku: '',
+      description: '',
+      group: '',
+      type: '',
+      attributes: ['department'],
+      cost: 0,
+      tags: ['default'],
+      order: 0,
+      code: 'Y',
+      included: false,
+      direct: true,
+      hidden: false,
+      print: true,
+      required: false,
+      recommended: false,
+      default: false,
+      addModifiers: [],
+      delModifiers: [],
+      conditions: {
+        _id: '67e5b6e619f55c6088fc2d00',
+        rules: [],
+        valid: true,
+      },
+      compute: null,
+      properties: {
+        department: {
+          splitUnit: 'pieces',
+          maxItems: '6',
+          autoSplit: true,
+        },
+        sort: null,
+      },
+      _computed: {
+        amount: 0,
+        description: 'DepMax6Pieces',
+      },
+      _hidden: false,
+      _isDeleted: false,
+      _id: '1',
+    };
+
+    const item1 = {
+      itemId: '62cdbfd01ee1b400193282b0',
+      name: 'Belt',
+      price: 0,
+      modifiersTotalAmount: 0,
+      quantity: 1,
+      pieces: 1,
+      weight: null,
+      modifiers: [
+        {
+          ...deparmentModifier,
+          _id: 1,
+        },
+      ],
+      total: 0,
+      totalPaid: 0,
+      notes: [],
+      subTotals: {},
+      properties: {
+        basePrice: 0,
+      },
+    };
+
+    const item2 = {
+      itemId: '62cdbfd01ee1b400193282f4',
+      name: 'Blanket King2',
+      price: 12,
+      modifiersTotalAmount: 0,
+      quantity: 1,
+      pieces: 1,
+      weight: null,
+      modifiers: [
+        {
+          ...deparmentModifier,
+          _id: 6,
+        },
+      ],
+      total: 12,
+      totalPaid: 0,
+      subTotals: {},
+      properties: {
+        basePrice: 12,
+      },
+    };
+
+    const order = {
+      user: '62cdbfcfaaf93c00193d2e7b',
+      customer: '66a3d7d366107c7369873980',
+      parentId: null,
+      isParent: false,
+      items: [
+        {
+          ...item1,
+          _id: 1,
+        },
+        {
+          ...item1,
+          _id: 2,
+        },
+        {
+          ...item1,
+          _id: 3,
+        },
+        {
+          ...item1,
+          _id: 4,
+        },
+        {
+          ...item2,
+          _id: 5,
+        },
+        {
+          ...item2,
+          _id: 6,
+        },
+        {
+          ...item2,
+          _id: 7,
+        },
+        {
+          ...item2,
+          _id: 8,
+        },
+      ],
+      subTotal: 48,
+      tax: 0,
+      discount: 0,
+      fee: 0,
+      total: 48,
+      totalPaid: 0,
+      modifiers: [],
+      displayId: 1554,
+      description: '',
+      type: '',
+      status: {
+        order: 'open',
+        kitchen: 'open',
+        delivery: 'none',
+        detailed: true,
+      },
+      attributes: [],
+      properties: {
+        split: 'auto',
+      },
+      _id: '67e5b66bed32e55e8e6e6603',
+      subTotals: {},
+      orders: [],
+    };
+
+    const splittedOrders = pricingService.order.autoSplit({
+      parentOrder: order,
+    });
+
+    expect(splittedOrders.length).toEqual(2);
+    expect(splittedOrders[0].items.length).toEqual(6);
+    expect(splittedOrders[0].items[0]).toMatchObject({ ...item1 });
+    expect(splittedOrders[0].items[1]).toMatchObject({ ...item1 });
+    expect(splittedOrders[0].items[2]).toMatchObject({ ...item1 });
+    expect(splittedOrders[0].items[3]).toMatchObject({ ...item1 });
+    expect(splittedOrders[0].items[4]).toMatchObject({ ...item2 });
+    expect(splittedOrders[0].items[5]).toMatchObject({ ...item2 });
+
+    expect(splittedOrders[1].items.length).toEqual(2);
+    expect(splittedOrders[1].items[0]).toMatchObject({ ...item2 });
+    expect(splittedOrders[1].items[1]).toMatchObject({ ...item2 });
+  });
+
+  test('should autoSplit. Department has maxQty6', () => {
+    const deparmentModifier = {
+      modifierId: '67e5b5faa8b435351f4c60b3',
+      _parentId: null,
+      locked: false,
+      name: 'DepMax6Qty',
+      sku: '',
+      description: '',
+      group: '',
+      type: '',
+      attributes: ['department'],
+      cost: 0,
+      tags: ['default'],
+      order: 0,
+      code: 'Y',
+      included: false,
+      direct: true,
+      hidden: false,
+      print: true,
+      required: false,
+      recommended: false,
+      default: false,
+      addModifiers: [],
+      delModifiers: [],
+      conditions: {
+        _id: '67e5b6e619f55c6088fc2d00',
+        rules: [],
+        valid: true,
+      },
+      compute: null,
+      properties: {
+        department: {
+          splitUnit: 'quantity',
+          maxItems: '6',
+          autoSplit: true,
+        },
+        sort: null,
+      },
+      _computed: {
+        amount: 0,
+        description: 'DepMax6Qty',
+      },
+      _hidden: false,
+      _isDeleted: false,
+      _id: '1',
+    };
+
+    const item1 = {
+      itemId: '62cdbfd01ee1b400193282b0',
+      name: 'Belt',
+      price: 0,
+      modifiersTotalAmount: 0,
+      quantity: 1,
+      pieces: 1,
+      weight: null,
+      modifiers: [
+        {
+          ...deparmentModifier,
+          _id: 1,
+        },
+      ],
+      total: 0,
+      totalPaid: 0,
+      notes: [],
+      subTotals: {},
+      properties: {
+        basePrice: 0,
+      },
+    };
+
+    const item2 = {
+      itemId: '62cdbfd01ee1b400193282f4',
+      name: 'Blanket King2',
+      price: 12,
+      modifiersTotalAmount: 0,
+      quantity: 1,
+      pieces: 1,
+      weight: null,
+      modifiers: [
+        {
+          ...deparmentModifier,
+          _id: 6,
+        },
+      ],
+      total: 12,
+      totalPaid: 0,
+      subTotals: {},
+      properties: {
+        basePrice: 12,
+      },
+    };
+
+    const order = {
+      user: '62cdbfcfaaf93c00193d2e7b',
+      customer: '66a3d7d366107c7369873980',
+      parentId: null,
+      isParent: false,
+      items: [
+        {
+          ...item1,
+          _id: 1,
+        },
+        {
+          ...item1,
+          _id: 2,
+        },
+        {
+          ...item1,
+          _id: 3,
+        },
+        {
+          ...item1,
+          _id: 4,
+        },
+        {
+          ...item2,
+          _id: 5,
+        },
+        {
+          ...item2,
+          _id: 6,
+        },
+        {
+          ...item2,
+          _id: 7,
+        },
+        {
+          ...item2,
+          _id: 8,
+        },
+      ],
+      subTotal: 48,
+      tax: 0,
+      discount: 0,
+      fee: 0,
+      total: 48,
+      totalPaid: 0,
+      modifiers: [],
+      displayId: 1554,
+      description: '',
+      type: '',
+      status: {
+        order: 'open',
+        kitchen: 'open',
+        delivery: 'none',
+        detailed: true,
+      },
+      attributes: [],
+      properties: {
+        split: 'auto',
+      },
+      _id: '67e5b66bed32e55e8e6e6603',
+      subTotals: {},
+      orders: [],
+    };
+
+    const splittedOrders = pricingService.order.autoSplit({
+      parentOrder: order,
+    });
+
+    expect(splittedOrders.length).toEqual(2);
+    expect(splittedOrders[0].items.length).toEqual(6);
+    expect(splittedOrders[0].items[0]).toMatchObject({ ...item1 });
+    expect(splittedOrders[0].items[1]).toMatchObject({ ...item1 });
+    expect(splittedOrders[0].items[2]).toMatchObject({ ...item1 });
+    expect(splittedOrders[0].items[3]).toMatchObject({ ...item1 });
+    expect(splittedOrders[0].items[4]).toMatchObject({ ...item2 });
+    expect(splittedOrders[0].items[5]).toMatchObject({ ...item2 });
+
+    expect(splittedOrders[1].items.length).toEqual(2);
+    expect(splittedOrders[1].items[0]).toMatchObject({ ...item2 });
+    expect(splittedOrders[1].items[1]).toMatchObject({ ...item2 });
+  });
+
+  test('should autoSplit. Department has maxQty6. Just one item of qty=12', () => {
+    const deparmentModifier = {
+      modifierId: '67e5b5faa8b435351f4c60b3',
+      _parentId: null,
+      locked: false,
+      name: 'DepMax6Qty',
+      sku: '',
+      description: '',
+      group: '',
+      type: '',
+      attributes: ['department'],
+      cost: 0,
+      tags: ['default'],
+      order: 0,
+      code: 'Y',
+      included: false,
+      direct: true,
+      hidden: false,
+      print: true,
+      required: false,
+      recommended: false,
+      default: false,
+      addModifiers: [],
+      delModifiers: [],
+      conditions: {
+        _id: '67e5b6e619f55c6088fc2d00',
+        rules: [],
+        valid: true,
+      },
+      compute: null,
+      properties: {
+        department: {
+          splitUnit: 'quantity',
+          maxItems: '6',
+          autoSplit: true,
+        },
+        sort: null,
+      },
+      _computed: {
+        amount: 0,
+        description: 'DepMax6Qty',
+      },
+      _hidden: false,
+      _isDeleted: false,
+      _id: '1',
+    };
+
+    const item1 = {
+      itemId: '62cdbfd01ee1b400193282b0',
+      name: 'Belt',
+      price: 0,
+      modifiersTotalAmount: 0,
+      quantity: 12,
+      pieces: 1,
+      weight: null,
+      modifiers: [
+        {
+          ...deparmentModifier,
+          _id: 1,
+        },
+      ],
+      total: 0,
+      totalPaid: 0,
+      notes: [],
+      subTotals: {},
+      properties: {
+        basePrice: 0,
+      },
+      _id: 1,
+    };
+
+    const order = {
+      user: '62cdbfcfaaf93c00193d2e7b',
+      customer: '66a3d7d366107c7369873980',
+      parentId: null,
+      isParent: false,
+      items: [item1],
+      subTotal: 48,
+      tax: 0,
+      discount: 0,
+      fee: 0,
+      total: 48,
+      totalPaid: 0,
+      modifiers: [],
+      displayId: 1554,
+      description: '',
+      type: '',
+      status: {
+        order: 'open',
+        kitchen: 'open',
+        delivery: 'none',
+        detailed: true,
+      },
+      attributes: [],
+      properties: {
+        split: 'auto',
+      },
+      _id: '67e5b66bed32e55e8e6e6603',
+      subTotals: {},
+      orders: [],
+    };
+
+    const splittedOrders = pricingService.order.autoSplit({
+      parentOrder: order,
+    });
+
+    expect(splittedOrders.length).toEqual(2);
+
+    expect(splittedOrders[0].items.length).toEqual(1);
+    expect(splittedOrders[0].items[0].name).toEqual(item1.name);
+    expect(splittedOrders[0].items[0].quantity).toEqual(6);
+
+    expect(splittedOrders[1].items.length).toEqual(1);
+    expect(splittedOrders[1].items[0].name).toEqual(item1.name);
+    expect(splittedOrders[1].items[0].quantity).toEqual(6);
+  });
 });

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/order/splitByDepartments.js

@@ -73,6 +73,8 @@ module.exports = ({ utils, _, actions, itemActions, modifierActions }) => {
         let newItemid = helpers.getObjectID();
 
         newItems.forEach(newItem => {
+          newItemid = helpers.getObjectID();
+
           for (let j = 0; j < newItem.quantity; j += 1) {
             const item = {
               ...newItem,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.69",
+  "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": "eb168a1c07915c479303713d45c4d40ebf692689"
+  "gitHead": "95b6471cd80c91a665a81a66fe95e12cdf45ca27"
 }