@darkpos/pricing 1.0.51 → 1.0.53

package/__TEST__/item/{getItemsModifierDescription.test.js → getModifierTags.test.js}

@@ -1,8 +1,10 @@
 const usePricing = require('../../lib/index');
 
 const pricingService = usePricing();
+const pricingServiceGroupModifiers = usePricing({
+  store: { _settings: { order: { groupModifiers: true } } },
+});
 
-const { getItemModifiersDescription } = pricingService.item;
 const mockModifier = {
   _id: '67106323db3c71afb52b07b7',
   attributes: ['override'],
@@ -37,7 +39,7 @@ const mockModifier = {
   },
   _computed: {
     amount: 0,
-    description: 'ItemsPriceManual ($0.00)',
+    description: 'ItemsPriceManual',
   },
   addModifiers: [],
   delModifiers: [],
@@ -46,13 +48,13 @@ const mockModifier = {
   _createdAt: '2024-10-17T01:12:34.370Z',
   _updatedAt: '2024-10-17T01:12:34.370Z',
 };
-describe('getItemModifiersDescription Function', () => {
+describe('getModifierTags Function', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   test('should return an empty array if item or modifiers are not provided', () => {
-    const result = getItemModifiersDescription(null);
+    const result = pricingService.item.getModifierTags({});
     expect(result).toEqual([]);
   });
 
@@ -69,50 +71,59 @@ describe('getItemModifiersDescription Function', () => {
       ],
     };
 
-    const result = getItemModifiersDescription(item);
+    const result = pricingService.item.getModifierTags({
+      item,
+    });
 
-    expect(result).toEqual([
+    expect(result).toMatchObject([
       {
         label: 'Desc 1',
         value: 'mod1',
         data: item.modifiers[0],
         quantity: 1,
       },
+      {
+        label: 'ItemsPriceManual',
+        value: 'mod2',
+        data: item.modifiers[1],
+        quantity: 1,
+      },
     ]);
   });
 
   test('should handle selected override options in the modifier', () => {
     const item = {
       modifiers: [
-        {
-          ...mockModifier,
-          _id: 'mod1',
-          name: 'Modifier 1',
-          compute: { amount: 100 },
-          properties: { override: { selected: { selectedUnit: 'kg' } } },
-        },
+        pricingService.modifier.calculate(
+          {
+            ...mockModifier,
+            _id: 'mod1',
+            name: 'Modifier 1',
+            compute: { amount: 200 },
+            properties: {
+              override: { selected: { selectedUnit: 'kg', value: 200 } },
+            },
+          },
+          { price: 10, quantity: 1 }
+        ),
       ],
     };
 
-    const result = getItemModifiersDescription(item);
+    const result = pricingService.item.getModifierTags({
+      item,
+    });
 
     expect(result).toEqual([
       {
-        label: 'Modifier 1 100 kg',
+        label: 'Modifier 1 ($200.00/kg)',
         value: 'mod1',
         data: item.modifiers[0],
-        quantity: 0,
+        quantity: 1,
       },
     ]);
   });
 
   test('should group modifiers when groupModifiers setting is true', () => {
-    const pricingService2 = usePricing({
-      store: { _settings: { order: { groupModifiers: true } } },
-    });
-
-    const { getItemModifiersDescription: getItemModifiersDescription2 } =
-      pricingService2.item;
     const item = {
       modifiers: [
         {
@@ -124,9 +135,9 @@ describe('getItemModifiersDescription Function', () => {
       ],
     };
 
-    const result = getItemModifiersDescription2(item);
+    const result = pricingServiceGroupModifiers.item.getModifierTags({ item });
 
-    expect(result).toEqual([
+    expect(result).toMatchObject([
       {
         label: '1 Desc 1',
         value: 'mod1',

package/__TEST__/item/getNoteTags.test.js

@@ -0,0 +1,52 @@
+const usePricing = require('../../index');
+
+const pricingService = usePricing();
+
+describe('pricingService.item.getNoteTags Function', () => {
+  test('should return empty array if no notes are provided', () => {
+    const result = pricingService.item.getNoteTags({
+      notes: null,
+    });
+    expect(result).toEqual([]);
+  });
+
+  test('should filter out notes that are null or have a url', () => {
+    const notes = [
+      { message: 'Note 1' },
+      { message: 'Note 2', url: 'http://example.com' }, // Should be filtered out
+      null, // Should be filtered out
+    ];
+
+    const result = pricingService.item.getNoteTags({ notes });
+
+    expect(result).toEqual([
+      { label: 'Note 1', value: '0', data: { message: 'Note 1' }, quantity: 1 },
+    ]);
+  });
+
+  test('should map notes to noteTags', () => {
+    const notes = [{ message: 'Note 1' }, { message: 'Note 2' }];
+
+    const result = pricingService.item.getNoteTags({ notes });
+
+    expect(result).toEqual([
+      { label: 'Note 1', value: '0', data: { message: 'Note 1' }, quantity: 1 },
+      { label: 'Note 2', value: '1', data: { message: 'Note 2' }, quantity: 1 },
+    ]);
+  });
+
+  test('should handle case where notes contain falsy values', () => {
+    const notes = [null, undefined, { message: 'Valid Note' }];
+
+    const result = pricingService.item.getNoteTags({ notes });
+
+    expect(result).toEqual([
+      {
+        label: 'Valid Note',
+        value: '0',
+        data: { message: 'Valid Note' },
+        quantity: 1,
+      },
+    ]);
+  });
+});

package/__TEST__/item.test.js

@@ -536,4 +536,297 @@ describe('Item actions', () => {
       _actual: 100,
     });
   });
+  test('CU-86dvbn63z: Calculate item with quantity > 1 and modifierAmountFixed10', () => {
+    const itemWithModifierAmountFixed10 = {
+      name: "Men's 3pc Tuxedo",
+      pieces: 3,
+      total: 53.03,
+      price: 13.5,
+      quantity: 3,
+      modifiers: [
+        {
+          _id: '675354ee39a47228afd1f1a4',
+          attributes: ['override'],
+          modifierId: '6751f7eeb60c71cefee138ee',
+          name: 'Override modamount fixed 10',
+          group: 'Upcharge',
+          type: 'fee',
+          tags: ['default', 'all'],
+          direct: true,
+          properties: {
+            override: {
+              type: 'fixed',
+              field: 'amount',
+              fixedValue: 10,
+              multiplier: false,
+            },
+          },
+          compute: { type: 'fixed', amount: 10, action: 'add' },
+        },
+      ],
+      _id: '675354e939a47228afd1f199',
+      properties: { basePrice: 13.5 },
+
+      itemId: '62cdbfd01ee1b400193281ee',
+    };
+    const newItem = pricingService.item.calculate(
+      itemWithModifierAmountFixed10
+    );
+
+    expect(newItem).toHaveProperty('total', 50.5);
+    expect(newItem).toHaveProperty('price', 13.5);
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 10,
+      description: 'Override modamount fixed 10 ($10.00)',
+    });
+
+    expect(newItem).toHaveProperty('subTotals', {
+      fee: 10,
+      _included: 0,
+      _xincluded: 10,
+      _direct: 10,
+      _xdirect: 0,
+      _simple: 40.5,
+      _actual: 40.5,
+    });
+  });
+
+  test('CU-86dvbn63z: Calculate item with quantity > 1 and modifierAmountFixed10 Multiplier', () => {
+    const itemWithModifierAmountFixed10Multiplier = {
+      name: "Men's 3pc Tuxedo",
+      pieces: 3,
+      total: 53.03,
+      price: 13.5,
+      quantity: 3,
+      modifiers: [
+        {
+          _id: '675354ee39a47228afd1f1a4',
+          attributes: ['override'],
+          modifierId: '6751f7eeb60c71cefee138ee',
+          name: 'Override modamount fixed 10',
+          group: 'Upcharge',
+          type: 'fee',
+          tags: ['default', 'all'],
+          direct: true,
+          properties: {
+            override: {
+              type: 'fixed',
+              field: 'amount',
+              fixedValue: 10,
+              multiplier: true,
+            },
+          },
+          compute: { type: 'fixed', amount: 10, action: 'add' },
+        },
+      ],
+      _id: '675354e939a47228afd1f199',
+      properties: { basePrice: 13.5 },
+
+      itemId: '62cdbfd01ee1b400193281ee',
+    };
+    const newItem = pricingService.item.calculate(
+      itemWithModifierAmountFixed10Multiplier
+    );
+
+    expect(newItem).toHaveProperty('total', 70.5);
+    expect(newItem).toHaveProperty('price', 13.5);
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 10,
+      description: 'Override modamount fixed 10 ($30.00)',
+    });
+
+    expect(newItem).toHaveProperty('subTotals', {
+      fee: 30,
+      _included: 0,
+      _xincluded: 30,
+      _direct: 30,
+      _xdirect: 0,
+      _simple: 40.5,
+      _actual: 40.5,
+    });
+  });
+
+  test('CU-86dvbn63z: Calculate item with quantity > 1 and quantity override modifier', () => {
+    const itemWithQuantityOverride5 = {
+      name: "Men's 3pc Tuxedo",
+      pieces: 3,
+      total: 70.88,
+      price: 13.5,
+      quantity: 5,
+      modifiers: [
+        {
+          _id: '67535f3ab4c5ea63d2d7964b',
+          attributes: ['override'],
+          modifierId: '675359b5d08f91f558233f85',
+          _parentId: null,
+          locked: false,
+          name: 'Override Item Quantity 5',
+          sku: '',
+          description: '',
+          group: 'Upcharge',
+          type: 'tax',
+          tags: ['default'],
+          order: 0,
+          included: false,
+          direct: true,
+          hidden: false,
+          print: true,
+          required: false,
+          recommended: false,
+          default: false,
+          code: '',
+          properties: {
+            subscription: {},
+            override: { type: 'fixed', field: 'quantity', fixedValue: 5 },
+            group: { items: [], modifiers: [] },
+            department: {},
+            sort: null,
+          },
+          _computed: { amount: 0, description: 'Override Item Quantity 5' },
+          addModifiers: [],
+          delModifiers: [],
+          conditions: { valid: true },
+          compute: null,
+          _createdAt: '2024-12-06T20:08:21.409Z',
+          _updatedAt: '2024-12-06T20:18:37.174Z',
+        },
+      ],
+      _id: '67535f34b4c5ea63d2d79640',
+      properties: { basePrice: 13.5 },
+      itemId: '62cdbfd01ee1b400193281ee',
+      menuRuleId: '65660855dfffaf2da26fb870',
+      __typename: 'OrderItem',
+    };
+    const newItem = pricingService.item.calculate(itemWithQuantityOverride5);
+
+    expect(newItem).toHaveProperty('total', 67.5);
+    expect(newItem).toHaveProperty('price', 13.5);
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 0,
+      description: 'Override Item Quantity 5',
+    });
+
+    expect(newItem).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: 0,
+      _direct: 0,
+      _xdirect: 0,
+      _simple: 67.5,
+      _actual: 67.5,
+    });
+  });
+
+  test('CU-86dvbn63z: Calculate item with quantity > 1 and modifieritemPriceFixed10', () => {
+    const itemWithModifierAmountFixed10 = {
+      name: "Men's 3pc Tuxedo",
+      pieces: 3,
+      price: 10,
+      quantity: 3,
+      modifiers: [
+        {
+          _id: '675354ee39a47228afd1f1a4',
+          attributes: ['override'],
+          modifierId: '6751f7eeb60c71cefee138ee',
+          name: 'Override item price fixed 10',
+          group: 'Upcharge',
+          type: 'fee',
+          tags: ['default', 'all'],
+          direct: true,
+          properties: {
+            override: {
+              type: 'fixed',
+              field: 'price',
+              fixedValue: 10,
+              multiplier: false,
+            },
+          },
+          compute: { type: 'fixed', amount: 10, action: 'add' },
+        },
+      ],
+      _id: '675354e939a47228afd1f199',
+      properties: { basePrice: 13.5 },
+
+      itemId: '62cdbfd01ee1b400193281ee',
+    };
+    const newItem = pricingService.item.calculate(
+      itemWithModifierAmountFixed10
+    );
+
+    expect(newItem).toHaveProperty('total', 30);
+    expect(newItem).toHaveProperty('price', 10);
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 0,
+      description: 'Override item price fixed 10 ($10.00/Unit)',
+    });
+
+    expect(newItem).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: 0,
+      _direct: 0,
+      _xdirect: 0,
+      _simple: 30,
+      _actual: 30,
+    });
+  });
+
+  test('CU-86dvbn63z: Calculate item with quantity > 1 and modifieritemPriceFixed1 multiplier', () => {
+    const item = {
+      name: "Men's 3pc Tuxedo",
+      pieces: 3,
+      total: 141.75,
+      price: 135,
+      quantity: 1,
+      modifiers: [
+        {
+          _id: '67536495bc57ccecf751a5dc',
+          attributes: ['override'],
+          modifierId: '6751e9c0b60c71cefee0c3cc',
+          _parentId: null,
+          locked: false,
+          name: 'Override Item Price 10 USD Multiplier',
+          group: 'Upcharge',
+          type: 'fee',
+          tags: ['default', 'all'],
+
+          direct: true,
+
+          properties: {
+            override: {
+              type: 'fixed',
+              field: 'price',
+              fixedValue: 10,
+              multiplier: true,
+            },
+          },
+          _computed: {
+            amount: 0,
+            description:
+              'Override Item Price 10 USD Multiplier (10 Unit @ $13.50/Unit)',
+          },
+          compute: { amount: 10 },
+        },
+      ],
+      _id: '675360d5bc57ccecf751a5b5',
+      properties: { basePrice: 13.5 },
+      itemId: '62cdbfd01ee1b400193281ee',
+    };
+    const newItem = pricingService.item.calculate(item);
+
+    expect(newItem).toHaveProperty('total', 135);
+    expect(newItem).toHaveProperty('price', 135);
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 0,
+      description:
+        'Override Item Price 10 USD Multiplier (10 Unit @ $13.50/Unit)',
+    });
+
+    expect(newItem).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: 0,
+      _direct: 0,
+      _xdirect: 0,
+      _simple: 135,
+      _actual: 135,
+    });
+  });
 });

package/__TEST__/mocks/addItemMock.js

@@ -73,7 +73,7 @@ const addItemMock = {
             properties: null,
             _computed: {
               amount: 0,
-              description: 'null ($0.00)',
+              description: 'null',
             },
           },
         ],

package/__TEST__/modifier/hasModifier.test.js

@@ -1402,7 +1402,7 @@ describe('hasModifier Function', () => {
           },
           _computed: {
             amount: 0,
-            description: 'White ($0.00)',
+            description: 'White',
           },
           addModifiers: [],
           delModifiers: [],

package/__TEST__/order/order-payment-modifier.test.js

@@ -60,7 +60,7 @@ describe('Order actions', () => {
     expect(cashPercentageDiscountOrder.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
-        description: 'CASH 10% DISCOUNT ($0.00)',
+        description: 'CASH 10% DISCOUNT',
       })
     );
 
@@ -469,7 +469,7 @@ describe('Order actions', () => {
     expect(testOrder.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
-        description: 'CASH 20% DISCOUNT ($0.00)',
+        description: 'CASH 20% DISCOUNT',
       })
     );
 
@@ -500,7 +500,7 @@ describe('Order actions', () => {
     expect(testOrder.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
-        description: 'CASH 20% DISCOUNT ($0.00)',
+        description: 'CASH 20% DISCOUNT',
       })
     );
 
@@ -533,7 +533,7 @@ describe('Order actions', () => {
     expect(testOrder.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
-        description: 'CASH 20% DISCOUNT ($0.00)',
+        description: 'CASH 20% DISCOUNT',
       })
     );
 
@@ -589,7 +589,7 @@ describe('Order actions', () => {
     expect(fullyPaidOrderWithCredit.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
-        description: 'CASH 20% DISCOUNT ($0.00)',
+        description: 'CASH 20% DISCOUNT',
       })
     );
 
@@ -638,7 +638,7 @@ describe('Order actions', () => {
     expect(fullyPaidOrderWithCash.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
-        description: 'CASH 20% DISCOUNT ($0.00)',
+        description: 'CASH 20% DISCOUNT',
       })
     );
 
@@ -719,7 +719,7 @@ describe('Order actions', () => {
               },
               _computed: {
                 amount: 0,
-                description: 'Alice Blue ($0.00)',
+                description: 'Alice Blue',
               },
               addModifiers: [],
               delModifiers: [],
@@ -762,7 +762,7 @@ describe('Order actions', () => {
               },
               _computed: {
                 amount: 0,
-                description: 'CASH 20% DISCOUNT ($0.00)',
+                description: 'CASH 20% DISCOUNT',
               },
               addModifiers: [],
               delModifiers: [],
@@ -810,7 +810,7 @@ describe('Order actions', () => {
               },
               _computed: {
                 amount: 0,
-                description: 'Light ($0.00)',
+                description: 'Light',
               },
               addModifiers: [],
               delModifiers: [],
@@ -857,7 +857,7 @@ describe('Order actions', () => {
               },
               _computed: {
                 amount: 0,
-                description: 'Box ($0.00)',
+                description: 'Box',
               },
               addModifiers: [],
               delModifiers: [],
@@ -1096,14 +1096,14 @@ describe('Order actions', () => {
     expect(resultedOrder.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
-        description: 'Alice Blue ($0.00)',
+        description: 'Alice Blue (0 Unit @ $13.50/Unit)',
       })
     );
 
     expect(resultedOrder.items[0].modifiers[1]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
-        description: 'CASH 20% DISCOUNT ($0.00)',
+        description: 'CASH 20% DISCOUNT',
       })
     );
 

package/__TEST__/order/order.test.js

@@ -1377,7 +1377,7 @@ describe('Order actions', () => {
               },
               _computed: {
                 amount: 0,
-                description: 'Laundry ($0.00)',
+                description: 'Laundry',
               },
               addModifiers: [],
               delModifiers: [],
@@ -1455,7 +1455,7 @@ describe('Order actions', () => {
               },
               _computed: {
                 amount: 0,
-                description: 'Dry Cleaning ($0.00)',
+                description: 'Dry Cleaning',
               },
               addModifiers: [],
               delModifiers: [],
@@ -1533,7 +1533,7 @@ describe('Order actions', () => {
               },
               _computed: {
                 amount: 0,
-                description: 'Dry Cleaning ($0.00)',
+                description: 'Dry Cleaning',
               },
               addModifiers: [],
               delModifiers: [],
@@ -2620,4 +2620,45 @@ describe('Order actions', () => {
       _actual: 4.65,
     });
   });
+
+  test('CU-86dvd3dbp Get calculated Order, multiple items and indirect modifiers #2 toNeareastMultiple (No Order Modifiers)', () => {
+    const pricingService2 = usePricing({
+      store: { _settings: { localization: { nearestMultiple: '0.5' } } },
+    });
+
+    const item1 = {
+      _id: 1,
+      price: 15.99,
+      quantity: 1,
+    };
+    const item2 = {
+      _id: 2,
+      price: 4.65,
+      quantity: 1,
+    };
+
+    const order = { items: [item1, item2] };
+    const newOrder = pricingService2.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 21);
+    expect(newOrder).toHaveProperty('subTotal', 20.64);
+    expect(newOrder).toHaveProperty('subTotals', {});
+    expect(newOrder.items[0]).toHaveProperty('total', 16.35);
+    expect(newOrder.items[0]).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: 0,
+      _direct: 0,
+      _xdirect: 0,
+      _simple: 15.99,
+      _actual: 15.99,
+    });
+    expect(newOrder.items[1]).toHaveProperty('total', 4.65);
+    expect(newOrder.items[1]).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: 0,
+      _direct: 0,
+      _xdirect: 0,
+      _simple: 4.65,
+      _actual: 4.65,
+    });
+  });
 });