@darkpos/pricing 1.0.51 → 1.0.52

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: [],

package/lib/item/calculate.js

@@ -85,7 +85,14 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
             ceach => ceach.modifierId === each.modifierId
           )
       )
-      .map(each => modifierActions.calculate(each, { skip: true }));
+      .map(each =>
+        modifierActions.calculate(each, {
+          price,
+          quantity,
+          skip: true,
+          basePrice: actions.getBasePrice(item),
+        })
+      );
 
     if (modifiersToCompute.length || paymentModifiersToCompute.length) {
       // sort modifiers based on sort
@@ -130,6 +137,7 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
           {
             price: computedPrice,
             quantity,
+            basePrice: actions.getBasePrice(item),
           }
         );
 
@@ -147,11 +155,22 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
 
         // adding this computeField because now the compute from a modifier can be null
         const computeField = getComputeModField(_modifier);
+
+        const isPercentage = computeField.type === 'percentage';
+        const isIgnoreQuantity = modifierActions.isIgnoreQuantity(_modifier);
+        const isNotFixedAddAndAmountGtPrice =
+          !modifierActions.isFixedAdd(_modifier) &&
+          math.gt(math.abs(computedAmountCalc), computedPriceCalc);
+
+        const isAmountOverrideAndNotMultiplier =
+          modifierActions.isAmountOverride(_modifier) &&
+          !modifierActions.isMultiplier(_modifier);
+
         let computedAmount =
-          computeField.type === 'percentage' ||
-          modifierActions.isIgnoreQuantity(_modifier) ||
-          (!modifierActions.isFixedAdd(_modifier) &&
-            math.gt(math.abs(computedAmountCalc), computedPriceCalc))
+          isPercentage ||
+          isIgnoreQuantity ||
+          isNotFixedAddAndAmountGtPrice ||
+          isAmountOverrideAndNotMultiplier
             ? _computed.amount
             : computedAmountCalc;
 

package/lib/item/getBasePrice.js

@@ -0,0 +1,7 @@
+module.exports = () =>
+  function getBasePrice(item) {
+    if (!item) return 0;
+    if (!item.properties || typeof item.properties.basePrice !== 'number')
+      return item.price;
+    return item.properties.basePrice;
+  };

package/lib/item/getModifierTags.js

@@ -0,0 +1,45 @@
+module.exports = ({ modifierActions, settings }) =>
+  function getModifierTags({ item, skipGrouping = false }) {
+    const groupModifiers =
+      settings && settings.order && settings.order.groupModifiers;
+
+    if (!item || !Array.isArray(item.modifiers)) return [];
+
+    let modifierTags = item.modifiers
+      .filter(
+        each => modifierActions.isValid(each) && !modifierActions.isGroup(each)
+      )
+      .map(modifier => {
+        const { name, _id } = modifier;
+
+        let label = name;
+
+        if (modifierActions.isGroupOfValues(modifier)) {
+          label = modifierActions.getSelectedValues(modifier) || label;
+        }
+
+        if (
+          modifier &&
+          !modifier.included &&
+          modifier._computed &&
+          modifier._computed.description
+        ) {
+          label = modifier._computed.description;
+        }
+
+        const modifierValue = {
+          label,
+          value: _id,
+          data: modifier,
+          quantity: 1,
+        };
+
+        return modifierValue;
+      });
+
+    if (groupModifiers && !skipGrouping) {
+      modifierTags = modifierActions.getGroupedModifiers(modifierTags);
+    }
+
+    return modifierTags;
+  };

package/lib/{modifier/getNotesToModifierTags.js → item/getNoteTags.js}

@@ -1,5 +1,5 @@
 module.exports = () =>
-  function getNotesToModifierTags({ notes, modifierTags }) {
+  function getNoteTags({ notes }) {
     let noteTags = [];
     if (notes && notes.length > 0) {
       noteTags =
@@ -17,5 +17,5 @@ module.exports = () =>
           }) || [];
     }
 
-    return modifierTags.concat(noteTags);
+    return noteTags;
   };

package/lib/item/index.js

@@ -23,7 +23,7 @@ const getItemsTotals = require('./getItemsTotals');
 const getNotIncludedModifiers = require('./getNotIncludedModifiers');
 const hasModifierWithValue = require('./hasModifierWithValue');
 const getItemsTotalPaid = require('./getItemsTotalPaid');
-const getItemModifiersDescription = require('./getItemModifiersDescription');
+const getModifierTags = require('./getModifierTags');
 const isRelatedItem = require('./isRelatedItem');
 const getParentItem = require('./getParentItem');
 const isParentIncluded = require('./isParentIncluded');
@@ -44,6 +44,8 @@ const getInvalidRequiredModifiers = require('./getInvalidRequiredModifiers');
 const getPriceWithoutModifiers = require('./getPriceWithoutModifiers');
 const getTotalsDifference = require('./getTotalsDifference');
 const getTotalNeareastDifference = require('./getTotalNeareastDifference');
+const getNoteTags = require('./getNoteTags');
+const getBasePrice = require('./getBasePrice');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -79,7 +81,7 @@ const itemActions = (deps = {}) => {
     getNotIncludedModifiers: getNotIncludedModifiers(innerDeps),
     hasModifierWithValue: hasModifierWithValue(innerDeps),
     getItemsTotalPaid: getItemsTotalPaid(innerDeps),
-    getItemModifiersDescription: getItemModifiersDescription(innerDeps),
+    getModifierTags: getModifierTags(innerDeps),
     isRelatedItem: isRelatedItem(innerDeps),
     getParentItem: getParentItem(innerDeps),
     isParentIncluded: isParentIncluded(innerDeps),
@@ -101,6 +103,8 @@ const itemActions = (deps = {}) => {
     getPriceWithoutModifiers: getPriceWithoutModifiers(innerDeps),
     getTotalsDifference: getTotalsDifference(innerDeps),
     getTotalNeareastDifference: getTotalNeareastDifference(innerDeps),
+    getNoteTags: getNoteTags(innerDeps),
+    getBasePrice: getBasePrice(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/item/removeModifier.js

@@ -56,10 +56,8 @@ module.exports = ({ modifierActions, _, actions }) => {
         )
     );
 
-    const hasOverride = modifiersToApply.find(
-      each =>
-        modifierActions.isOverride(each) ||
-        modifierActions.isComputedOverride(each)
+    const hasOverride = modifiersToApply.find(each =>
+      modifierActions.isOverride(each)
     );
 
     if (hasOverride) {
@@ -68,10 +66,7 @@ module.exports = ({ modifierActions, _, actions }) => {
 
       if (modifierActions.isQuantityOverride(modifier)) nextItem.quantity = 1;
 
-      if (
-        modifierActions.isPriceOverride(modifier) ||
-        modifierActions.isComputedOverride(modifier)
-      )
+      if (modifierActions.isPriceOverride(modifier))
         nextItem.price = actions.getItemPrice({
           item: originalItem,
           cache,

package/lib/modifier/calculate.js

@@ -9,7 +9,7 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
 
   return function calculate(
     _modifier = {},
-    options = { price: 0, quantity: 0, skip: false }
+    options = { price: 0, quantity: 0, skip: false, basePrice: 0 }
   ) {
     const modifier = _modifier;
     const { name } = modifier;
@@ -43,16 +43,49 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
           100
         );
 
-      if (!type || action === Modifier.Compute.Actions.OVERRIDE)
-        _computed.amount = 0;
+      if (!type) _computed.amount = 0;
 
       if (math.gt(math.abs(_computed.amount), maxAmount)) {
         _computed.amount = maxAmount * multiplier;
       }
     }
 
-    const localAmount = localization.formatAmount(_computed.amount);
-    _computed.description = `${name} (${localAmount})`;
+    const localAmount =
+      !!_computed.amount && Number(_computed.amount) !== 0
+        ? `${localization.formatAmount(_computed.amount)}`
+        : '';
+
+    const localBasePrice = localization.formatAmount(
+      options.basePrice || options.price || 0
+    );
+
+    const isMultiplier = actions.isMultiplier(modifier);
+
+    _computed.description = `${name}${localAmount ? ` (${localAmount})` : ''}`;
+
+    if (actions.isPriceOverride(modifier)) {
+      _computed.description = isMultiplier
+        ? `${name} (${compute.amount} Unit @ ${localBasePrice}/Unit)`
+        : `${name} (${localization.formatAmount(compute.amount)}/Unit)`;
+    }
+
+    if (actions.isAmountOverride(modifier) && isMultiplier) {
+      _computed.description = `${name} (${localization.formatAmount(
+        math.mul(_computed.amount, options.quantity)
+      )})`;
+    }
+
+    if (actions.isOptionsSelectedOverride(modifier)) {
+      const selectedOverrideOptions = _.get(
+        modifier,
+        'properties.override.selected'
+      );
+      _computed.description = isMultiplier
+        ? `${name} (${compute.amount} Unit @ ${localBasePrice}/${selectedOverrideOptions.selectedUnit})`
+        : `${name} (${localization.formatAmount(compute.amount)}/${
+            selectedOverrideOptions.selectedUnit
+          })`;
+    }
 
     return { ..._.cloneDeep(modifier), _computed };
   };

package/lib/modifier/index.js

@@ -89,7 +89,6 @@ const isService = require('./isService');
 const isSingleValue = require('./isSingleValue');
 const isGroupOfItems = require('./isGroupOfItems');
 const isOverride = require('./isOverride');
-const isComputedOverride = require('./isComputedOverride');
 const isDepartment = require('./isDepartment');
 const isRequired = require('./isRequired');
 const isMultiplier = require('./isMultiplier');
@@ -129,7 +128,6 @@ const hasItems = require('./hasItems');
 const removeGroupData = require('./removeGroupData');
 const isRelatedModifier = require('./isRelatedModifier');
 const getGroupedModifiers = require('./getGroupedModifiers');
-const getNotesToModifierTags = require('./getNotesToModifierTags');
 const isOptionsOverride = require('./isOptionsOverride');
 const getGroupedModifierLabels = require('./getGroupedModifierLabels');
 const validate = require('./validate');
@@ -149,6 +147,7 @@ const isChild = require('./isChild');
 const isExtractCalculatedValue = require('./isExtractCalculatedValue');
 const getPriceWithoutModifier = require('./getPriceWithoutModifier');
 const isGroup = require('./isGroup');
+const isOptionsSelectedOverride = require('./isOptionsSelectedOverride');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -250,7 +249,6 @@ const modifierActions = (deps = {}) => {
     isSingleValue: isSingleValue(innerDeps),
     isGroupOfItems: isGroupOfItems(innerDeps),
     isOverride: isOverride(innerDeps),
-    isComputedOverride: isComputedOverride(innerDeps),
     isDepartment: isDepartment(innerDeps),
     isRequired: isRequired(innerDeps),
     isMultiplier: isMultiplier(innerDeps),
@@ -289,7 +287,6 @@ const modifierActions = (deps = {}) => {
     removeGroupData: removeGroupData(innerDeps),
     isRelatedModifier: isRelatedModifier(innerDeps),
     getGroupedModifiers: getGroupedModifiers(innerDeps),
-    getNotesToModifierTags: getNotesToModifierTags(innerDeps),
     isOptionsOverride: isOptionsOverride(innerDeps),
     getGroupedModifierLabels: getGroupedModifierLabels(innerDeps),
     validate: validate(innerDeps),
@@ -311,6 +308,7 @@ const modifierActions = (deps = {}) => {
     isExtractCalculatedValue: isExtractCalculatedValue(innerDeps),
     getPriceWithoutModifier: getPriceWithoutModifier(innerDeps),
     isGroup: isGroup(innerDeps),
+    isOptionsSelectedOverride: isOptionsSelectedOverride(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/isGroup.js

@@ -1,10 +1,5 @@
 module.exports = ({ actions }) =>
   function isGroup(modifier) {
     if (!modifier) return false;
-    return !!(
-      actions.hasAttribute(modifier, 'group') ||
-      (modifier.properties &&
-        modifier.properties.group &&
-        Object.keys(modifier.properties.group) > 0)
-    );
+    return !!actions.hasAttribute(modifier, 'group');
   };

package/lib/modifier/isOptionsSelectedOverride.js

@@ -0,0 +1,7 @@
+module.exports = ({ _, actions }) =>
+  function isOptionsSelectedOverride(modifier) {
+    return !!(
+      actions.isOverride(modifier) &&
+      !!_.get(modifier, 'properties.override.selected')
+    );
+  };

package/lib/order/addItemModifier.js

@@ -143,13 +143,25 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       };
     }
 
-    if (modifierActions.isQuantityOverride(modifier) && modifier.compute) {
-      item.quantity = modifier.compute.amount || 1;
+    if (modifierActions.isQuantityOverride(modifier)) {
+      if (modifier.compute && typeof modifier.compute.amount === 'number') {
+        item.quantity = modifier.compute.amount || 1;
+      } else if (typeof modifier.properties.override.fixedValue === 'number') {
+        item.quantity = modifier.properties.override.fixedValue;
+      }
     }
 
-    if (isPriceOverride || modifierActions.isComputedOverride(modifier)) {
+    if (isPriceOverride) {
+      item.properties = {
+        ...(item.properties || {}),
+        basePrice: item.price,
+      };
       item.price = getPrice({ modifier: modifierToAdd, item });
     } else {
+      item.properties = {
+        ...(item.properties || {}),
+        basePrice: item.price,
+      };
       item.price = itemActions.getItemPrice({
         item,
         cache,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.51",
+  "version": "1.0.52",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -18,6 +18,7 @@
     "test:hasModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/hasModifier.test.js",
     "test:item": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/item.test.js",
     "test:split": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/split.test.js",
+    "test:getModifierTags": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/item/getModifierTags.test.js",
     "lint": "eslint --quiet lib/"
   },
   "publishConfig": {
@@ -41,5 +42,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "256cf9e7f41cbdf88d38713f8edae725ec5e855e"
+  "gitHead": "43e5d458336e6d49ffbcf8af2a715428364a4df5"
 }

package/__TEST__/modifier/getNotesToModifierTags.test.js

@@ -1,78 +0,0 @@
-const getNotesToModifierTagsFunction = require('../../lib/modifier/getNotesToModifierTags');
-
-describe('getNotesToModifierTags Function', () => {
-  const getNotesToModifierTags = getNotesToModifierTagsFunction();
-
-  test('should return modifierTags if no notes are provided', () => {
-    const modifierTags = [
-      { label: 'Modifier 1', value: 'mod1', data: {}, quantity: 1 },
-    ];
-
-    const result = getNotesToModifierTags({ notes: null, modifierTags });
-    expect(result).toEqual(modifierTags);
-  });
-
-  test('should return modifierTags if notes array is empty', () => {
-    const modifierTags = [
-      { label: 'Modifier 1', value: 'mod1', data: {}, quantity: 1 },
-    ];
-
-    const result = getNotesToModifierTags({ notes: [], modifierTags });
-    expect(result).toEqual(modifierTags);
-  });
-
-  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 modifierTags = [
-      { label: 'Modifier 1', value: 'mod1', data: {}, quantity: 1 },
-    ];
-
-    const result = getNotesToModifierTags({ notes, modifierTags });
-
-    expect(result).toEqual([
-      { label: 'Modifier 1', value: 'mod1', data: {}, quantity: 1 },
-      { label: 'Note 1', value: '0', data: { message: 'Note 1' }, quantity: 1 },
-    ]);
-  });
-
-  test('should map notes to noteTags and append to modifierTags', () => {
-    const notes = [{ message: 'Note 1' }, { message: 'Note 2' }];
-
-    const modifierTags = [
-      { label: 'Modifier 1', value: 'mod1', data: {}, quantity: 1 },
-    ];
-
-    const result = getNotesToModifierTags({ notes, modifierTags });
-
-    expect(result).toEqual([
-      { label: 'Modifier 1', value: 'mod1', data: {}, quantity: 1 },
-      { 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 modifierTags = [
-      { label: 'Modifier 1', value: 'mod1', data: {}, quantity: 1 },
-    ];
-
-    const result = getNotesToModifierTags({ notes, modifierTags });
-
-    expect(result).toEqual([
-      { label: 'Modifier 1', value: 'mod1', data: {}, quantity: 1 },
-      {
-        label: 'Valid Note',
-        value: '0',
-        data: { message: 'Valid Note' },
-        quantity: 1,
-      },
-    ]);
-  });
-});

package/__TEST__/modifier/isComputedOverride.test.js

@@ -1,38 +0,0 @@
-const isComputedOverrideFunction = require('../../lib/modifier/isComputedOverride');
-
-describe('isComputedOverride Function', () => {
-  const Modifier = {
-    Attributes: {
-      OVERRIDE: 'override',
-    },
-  };
-
-  const isComputedOverride = isComputedOverrideFunction({
-    constants: { Modifier },
-  });
-
-  test('should return false if modifier is null or undefined', () => {
-    expect(isComputedOverride(null)).toBe(false);
-    expect(isComputedOverride(undefined)).toBe(false);
-  });
-
-  test('should return false if modifier does not have compute property', () => {
-    const modifier = {};
-    expect(isComputedOverride(modifier)).toBe(false);
-  });
-
-  test('should return false if compute does not have action property', () => {
-    const modifier = { compute: {} };
-    expect(isComputedOverride(modifier)).toBe(false);
-  });
-
-  test('should return false if compute action is not OVERRIDE', () => {
-    const modifier = { compute: { action: 'other_action' } };
-    expect(isComputedOverride(modifier)).toBe(false);
-  });
-
-  test('should return true if compute action is OVERRIDE', () => {
-    const modifier = { compute: { action: 'override' } };
-    expect(isComputedOverride(modifier)).toBe(true);
-  });
-});

package/lib/item/getItemModifiersDescription.js

@@ -1,56 +0,0 @@
-module.exports = ({ modifierActions, _, settings }) =>
-  function getItemModifiersDescription(item) {
-    const groupModifiers =
-      settings && settings.order && settings.order.groupModifiers;
-    if (!item || !Array.isArray(item.modifiers)) return [];
-    let description = item.modifiers
-      .filter(
-        each =>
-          !modifierActions.isHidden(each) &&
-          modifierActions.isValid(each) &&
-          !modifierActions.isAmountOverride(each) &&
-          !modifierActions.isDepartment(each) &&
-          modifierActions.isDirect(each) &&
-          !modifierActions.isGroup(each)
-      )
-      .map(modifier => {
-        const { name, _id, compute = {} } = modifier;
-        let label = name;
-        if (modifierActions.isGroupOfValues(modifier))
-          label = modifierActions.getSelectedValues(modifier) || label;
-        const selectedOverrideOptions = _.get(
-          modifier,
-          'properties.override.selected'
-        );
-        if (
-          modifier &&
-          !modifier.included &&
-          modifier._computed &&
-          modifier._computed.description
-        ) {
-          label = modifier._computed.description;
-        }
-
-        const modifierValue = {
-          label,
-          value: _id,
-          data: modifier,
-          quantity: 1,
-        };
-
-        if (selectedOverrideOptions) {
-          modifierValue.label = `${name} ${compute.amount} ${selectedOverrideOptions.selectedUnit}`;
-          modifierValue.quantity = 0;
-        }
-        return modifierValue;
-      });
-    if (groupModifiers) {
-      description = modifierActions.getGroupedModifiers(description);
-    }
-
-    const descriptions = modifierActions.getNotesToModifierTags({
-      notes: item.notes,
-      modifierTags: description,
-    });
-    return descriptions;
-  };

package/lib/modifier/isComputedOverride.js

@@ -1,8 +0,0 @@
-module.exports = ({ constants }) => {
-  const { Modifier } = constants;
-  return function isComputedOverride(modifier) {
-    const computeAction =
-      modifier && modifier.compute && modifier.compute.action;
-    return computeAction === Modifier.Attributes.OVERRIDE;
-  };
-};