@darkpos/pricing 1.0.142 → 1.0.145

package/__TEST__/item.test.js

@@ -814,7 +814,7 @@ describe('Item actions', () => {
     expect(newItem).toHaveProperty('price', 10);
     expect(newItem.modifiers[0]).toHaveProperty('_computed', {
       amount: 0,
-      description: 'Override item price fixed 10 ($10.00/Unit)',
+      description: 'Override item price fixed 10 ($10.00/unit)',
     });
 
     expect(newItem).toHaveProperty('subTotals', {
@@ -867,8 +867,7 @@ describe('Item actions', () => {
     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)',
+      description: 'Override Item Price 10 USD Multiplier (10 @ $13.50/unit)',
     });
 
     expect(newItem).toHaveProperty('subTotals', {
@@ -1356,7 +1355,7 @@ describe('Item actions', () => {
     expect(calculatedOrder.items[0].price).toBe(0);
     expect(calculatedOrder.items[0].total).toBe(0);
     expect(calculatedOrder.items[0].modifiers[0]._computed.description).toBe(
-      'No Clean (0 Unit @ $0.00/Unit)'
+      'No Clean (0 @ $0.00/unit)'
     );
     expect(calculatedOrder.items[0].modifiers[1]._computed.description).toBe(
       '30% Family Discount'
@@ -1480,7 +1479,7 @@ describe('Item actions', () => {
       '30% Family Discount'
     );
     expect(calculatedOrder.items[0].modifiers[1]._computed.description).toBe(
-      'No Clean (0 Unit @ $0.00/Unit)'
+      'No Clean (0 @ $0.00/unit)'
     );
   });
 
@@ -1668,7 +1667,7 @@ describe('Item actions', () => {
     expect(newItem).toHaveProperty('price', 0);
     expect(newItem.modifiers[0]).toHaveProperty('_computed', {
       amount: 0,
-      description: 'Override item price fixed 0 ($0.00/Unit)',
+      description: 'Override item price fixed 0 ($0.00/unit)',
     });
 
     expect(newItem.modifiers[1]).toHaveProperty('_computed', {
@@ -1804,7 +1803,7 @@ describe('Item actions', () => {
     expect(newItem.total).toBe(5.5);
     expect(newItem.modifiers[0]).toHaveProperty('_computed', {
       amount: 0,
-      description: 'Override item price fixed 0 ($5.00/Unit)',
+      description: 'Override item price fixed 0 ($5.00/unit)',
     });
 
     expect(newItem.modifiers[1]).toHaveProperty('_computed', {
@@ -1875,7 +1874,7 @@ describe('Item actions', () => {
 
     expect(newItem.modifiers[1]).toHaveProperty('_computed', {
       amount: 0,
-      description: 'Override item price fixed 0 ($5.00/Unit)',
+      description: 'Override item price fixed 0 ($5.00/unit)',
     });
 
     expect(newItem).toHaveProperty('subTotals', {
@@ -1922,7 +1921,7 @@ describe('Item actions', () => {
 
     expect(newItem.modifiers[0]).toHaveProperty('_computed', {
       amount: 0,
-      description: 'Override item price fixed 0 ($5.00/Unit)',
+      description: 'Override item price fixed 0 ($5.00/unit)',
     });
     expect(newItem.modifiers[0].conditions.valid).toBe(false);
 
@@ -1941,7 +1940,7 @@ describe('Item actions', () => {
 
     expect(newItem.modifiers[0]).toHaveProperty('_computed', {
       amount: 0,
-      description: 'Override item price fixed 0 ($5.00/Unit)',
+      description: 'Override item price fixed 0 ($5.00/unit)',
     });
     expect(newItem.modifiers[0].conditions.valid).toBe(true);
 
@@ -2695,4 +2694,204 @@ describe('Item actions', () => {
       expect(updatedItem.price).toBe(14.5);
     });
   });
+  test('CU-86dzhxcmx: Show accurate description for options modifier', () => {
+    const item = {
+      name: 'Coat',
+      description: '',
+      pieces: 1,
+      modifiersTotalAmount: 0,
+      totalPaid: 0,
+      price: 13,
+      quantity: 1,
+      path: ',68a0ea81aa30dd1524162285,68a102e959fd1012e3aaa97b,',
+      notes: [],
+      serial: null,
+      sku: '',
+      modifiers: [
+        {
+          _id: '69974da407b7cf050250222e',
+          attributes: ['override'],
+          modifierId: '699738ae40884707d55d5142',
+          _parentId: null,
+          locked: false,
+          name: 'Pleats',
+          sku: '',
+          description: '',
+          group: '',
+          type: '',
+          tags: ['default'],
+          order: 0,
+          included: false,
+          direct: true,
+          hidden: false,
+          print: true,
+          required: false,
+          recommended: false,
+          default: false,
+          code: '',
+          properties: {
+            override: {
+              field: 'price',
+              type: null,
+              fixedValue: null,
+              service: null,
+              multiplier: true,
+              unitAsAmountMultiplier: false,
+              amountMultiplier: null,
+              options: [
+                {
+                  label: 'Pleats',
+                  input: 'multiply',
+                  units: ['pleat'],
+                },
+              ],
+              selected: {
+                label: 'Pleats',
+                input: 'multiply',
+                units: ['pleat'],
+                _id: '69974da007b7cf050250222d',
+                selectedUnit: 'pleat',
+              },
+            },
+            sort: null,
+          },
+          conditions: {
+            valid: true,
+          },
+          compute: {
+            amount: 4,
+          },
+          _createdAt: '2026-02-19T16:22:06.530Z',
+          _updatedAt: '2026-02-19T16:42:25.064Z',
+          __typename: 'Modifier',
+          addModifiers: [],
+          delModifiers: [],
+        },
+      ],
+      _id: '69974d9e07b7cf0502502227',
+      _updatedAt: '2026-02-12T21:24:47.256Z',
+      _createdAt: '2025-08-16T21:19:58.509Z',
+      weight: 0,
+      properties: {
+        overwrittenPrice: 13,
+      },
+      hasInventory: true,
+      inventoryType: 'push',
+      serialRequired: null,
+      tags: [],
+      category: null,
+      __typename: 'OrderItem',
+      priceLevels: [
+        {
+          value: 13,
+          tags: ['default'],
+        },
+        {
+          value: 6,
+          tags: ['police'],
+        },
+        {
+          value: 11,
+          tags: ['default', 'press only'],
+        },
+        {
+          value: 4,
+          tags: ['police', 'press only'],
+        },
+      ],
+      costLevels: [],
+      itemId: '68a0f5feaa30dd15241630e1',
+      menuRuleId: '68a1039559fd1012e3aaa98e',
+    };
+    const newItem = pricingService.item.calculate(item);
+
+    expect(newItem).toHaveProperty('total', 52);
+    expect(newItem).toHaveProperty('price', 52);
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 0,
+      description: 'Pleats (4 @ $13.00/pleat)',
+    });
+  });
+
+  test('CU-86dzhxcmx: Show accurate description for override.amount modifier', () => {
+    const item = {
+      name: 'Coat',
+      description: '',
+      pieces: 1,
+      modifiersTotalAmount: 0,
+      total: 25.2,
+      totalPaid: 0,
+      price: 13,
+      quantity: 1,
+      path: ',68a0ea81aa30dd1524162285,68a102e959fd1012e3aaa97b,',
+      notes: [],
+      serial: null,
+      sku: '',
+      modifiers: [
+        {
+          _id: '69976be93caefd42eef93bed',
+          attributes: ['override'],
+          modifierId: '699738ae40884707d55d5142',
+          _parentId: null,
+          locked: false,
+          name: 'Pleats',
+          tags: ['default'],
+          properties: {
+            override: {
+              field: 'amount',
+              type: 'manual',
+              fixedValue: 2,
+              service: null,
+              multiplier: true,
+              unitAsAmountMultiplier: true,
+              amountMultiplier: 5.5,
+              options: null,
+            },
+            sort: null,
+          },
+          conditions: {
+            valid: true,
+          },
+          compute: {
+            type: 'fixed',
+            amount: 2,
+            action: 'add',
+          },
+          _createdAt: '2026-02-19T16:22:06.530Z',
+          _updatedAt: '2026-02-19T19:56:51.708Z',
+          __typename: 'Modifier',
+          addModifiers: [],
+          delModifiers: [],
+        },
+      ],
+      _id: '69976be33caefd42eef93be8',
+      priceLevels: [
+        {
+          value: 13,
+          tags: ['default'],
+        },
+        {
+          value: 6,
+          tags: ['police'],
+        },
+        {
+          value: 11,
+          tags: ['default', 'press only'],
+        },
+        {
+          value: 4,
+          tags: ['police', 'press only'],
+        },
+      ],
+      costLevels: [],
+    };
+    const newItem = pricingService.item.calculate(item);
+
+    expect(newItem).toHaveProperty('total', 24);
+    expect(newItem).toHaveProperty('price', 13);
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 11,
+      description: 'Pleats (2 @ $5.50/unit)',
+    });
+  });
 });

package/__TEST__/order/hasSerial.test.js

@@ -0,0 +1,86 @@
+const usePricing = require('../../index');
+const mockStores = require('../mocks/stores');
+
+const session = {
+  store: mockStores[0],
+};
+
+const pricingService = usePricing(session);
+
+describe('hasSerial function', () => {
+  test('returns true when another item has the same serial', () => {
+    const { hasSerial } = pricingService.order;
+
+    const order = {
+      items: [
+        {
+          _id: '1',
+          serial: 'ABC-123',
+        },
+      ],
+    };
+
+    const item = {
+      _id: '2',
+      serial: ' abc-123 ',
+    };
+
+    const result = hasSerial({ order, item });
+
+    expect(result).toBe(true);
+  });
+
+  test('returns false when the matching serial belongs to the same item', () => {
+    const { hasSerial } = pricingService.order;
+
+    const order = {
+      items: [
+        {
+          _id: '1',
+          serial: 'ABC-123',
+        },
+      ],
+    };
+
+    const item = {
+      _id: '1',
+      serial: 'ABC-123',
+    };
+
+    const result = hasSerial({ order, item });
+
+    expect(result).toBe(false);
+  });
+
+  test('returns false for related items', () => {
+    const { hasSerial } = pricingService.order;
+
+    const order = {
+      items: [
+        {
+          _id: '1',
+          serial: 'ABC-123',
+        },
+      ],
+    };
+
+    const item = {
+      _id: '2',
+      serial: 'ABC-123',
+      properties: {
+        relatedItem: true,
+      },
+    };
+
+    const result = hasSerial({ order, item });
+
+    expect(result).toBe(false);
+  });
+
+  test('returns false when order or item is missing', () => {
+    const { hasSerial } = pricingService.order;
+
+    expect(hasSerial({ order: null, item: { serial: 'ABC-123' } })).toBe(false);
+    expect(hasSerial({ order: { items: [] }, item: null })).toBe(false);
+  });
+});

package/lib/modifier/createDescription.js

@@ -1,43 +1,49 @@
 module.exports = ({ actions, localization, _, utils }) =>
   function createDescription({ modifier, price }) {
-    const { _computed, compute, name } = modifier;
-
-    let description = '';
-    const localAmount =
-      !!_computed.amount && Number(_computed.amount) !== 0
-        ? `${localization.formatAmount(_computed.amount)}`
-        : '';
-
-    const localBasePrice = localization.formatAmount(price || 0);
-
+    const name = _.get(modifier, 'name', '');
+    const computedAmount = _.get(modifier, '_computed.amount', 0);
+    const computeAmount = _.get(modifier, 'compute.amount', 0);
     const isMultiplier = actions.isMultiplierOverride(modifier);
 
-    description = `${name}${localAmount ? ` (${localAmount})` : ''}`;
+    const UNIT_SUFFIX = '/unit';
+
+    if (actions.isAmountOverride(modifier) && isMultiplier) {
+      const isAmountMultiplier = actions.isAmountMultiplier(modifier);
 
-    if (actions.isPriceOverride(modifier)) {
-      const dividedPrice = localization.formatAmount(
-        price && compute.amount ? utils.math.div(price, compute.amount) : 0
+      const amountMultiplier = localization.formatAmount(
+        actions.getAmountMultiplier(modifier)
       );
-      description = isMultiplier
-        ? `${name} (${compute.amount} Unit @ ${dividedPrice}/Unit)`
-        : `${name} (${localization.formatAmount(compute.amount)}/Unit)`;
-    }
+      if (isAmountMultiplier) {
+        return `${name} (${computeAmount} @ ${amountMultiplier}${UNIT_SUFFIX})`;
+      }
 
-    if (actions.isAmountOverride(modifier) && isMultiplier) {
-      description = `${name} (${localization.formatAmount(_computed.amount)})`;
+      return `${name} (${localization.formatAmount(computedAmount)})`;
     }
 
-    if (actions.isOptionsSelectedOverride(modifier)) {
-      const selectedOverrideOptions = _.get(
+    if (
+      actions.isPriceOverride(modifier) ||
+      actions.isOptionsSelectedOverride(modifier)
+    ) {
+      const selectedUnit = _.get(
         modifier,
-        'properties.override.selected'
+        'properties.override.selected.selectedUnit'
       );
-      description = isMultiplier
-        ? `${name} (${compute.amount} Unit @ ${localBasePrice}/${selectedOverrideOptions.selectedUnit})`
-        : `${name} (${localization.formatAmount(compute.amount)}/${
-            selectedOverrideOptions.selectedUnit
-          })`;
+      const unitSuffix = selectedUnit ? `/${selectedUnit}` : UNIT_SUFFIX;
+
+      if (isMultiplier) {
+        const dividedPrice = localization.formatAmount(
+          price && computeAmount ? utils.math.div(price, computeAmount) : 0
+        );
+        return `${name} (${computeAmount} @ ${dividedPrice}${unitSuffix})`;
+      }
+
+      return `${name} (${localization.formatAmount(computeAmount)}${unitSuffix})`;
     }
 
-    return description;
+    const localAmount =
+      computedAmount && Number(computedAmount) !== 0
+        ? localization.formatAmount(computedAmount)
+        : '';
+
+    return `${name}${localAmount ? ` (${localAmount})` : ''}`;
   };

package/lib/order/hasSerial.js

@@ -0,0 +1,29 @@
+const normalizeSerial = serial => {
+  if (typeof serial !== 'string') return '';
+  return serial.trim().toUpperCase();
+};
+
+module.exports = ({ itemActions }) =>
+  function hasSerial({ order, item }) {
+    if (
+      !item ||
+      !item.serial ||
+      !order ||
+      !order.items ||
+      itemActions.isRelatedItem(item)
+    )
+      return false;
+
+    const normalizedSerial = normalizeSerial(item.serial);
+
+    if (!normalizedSerial) return false;
+
+    return order.items
+      .filter(
+        orderItem =>
+          orderItem._id !== item._id && !itemActions.isRelatedItem(orderItem)
+      )
+      .some(
+        orderItem => normalizeSerial(orderItem.serial) === normalizedSerial
+      );
+  };

package/lib/order/index.js

@@ -101,6 +101,7 @@ const getTaxes = require('./getTaxes');
 const getPickedStatus = require('./getPickedStatus');
 const calculateWithPayment = require('./calculateWithPayment');
 const getOverpaidAmount = require('./getOverpaidAmount');
+const hasSerial = require('./hasSerial');
 
 const orderActions = (deps = {}) => {
   const actions = {};
@@ -213,6 +214,7 @@ const orderActions = (deps = {}) => {
     getPickedStatus: getPickedStatus(innerDeps),
     calculateWithPayment: calculateWithPayment(innerDeps),
     getOverpaidAmount: getOverpaidAmount(innerDeps),
+    hasSerial: hasSerial(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.142",
+  "version": "1.0.145",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -32,6 +32,7 @@
     "test:addItemModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/addItemModifier.test.js",
     "test:payment": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/payment.test.js",
     "test:orderPaymentModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/order-payment-modifier.test.js",
+    "test:hasSerial": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/hasSerial.test.js",
     "lint": "eslint --quiet lib/"
   },
   "publishConfig": {
@@ -53,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "e7382ab79964b44db2814e58b06a8dfe5c036b34"
+  "gitHead": "eb6adf31020d7ca3b57f6e6b1bfa20c4e0289ca0"
 }