@darkpos/pricing 1.0.137 → 1.0.138

package/__TEST__/order/order.test.js

@@ -3740,6 +3740,9 @@ describe('Order actions', () => {
     const orderItem = {
       price: 0,
       quantity: 1,
+      status: {
+        picked: { value: true },
+      },
     };
     const order = { items: [orderItem] };
     const pricing = usePricing({
@@ -3748,6 +3751,7 @@ describe('Order actions', () => {
     const newOrder = pricing.order.calculate(order);
 
     expect(newOrder).toHaveProperty('total', 0);
+
     expect(newOrder.status).toMatchObject({ paid: true });
     expect(newOrder.items[0].total).toBe(0);
     expect(newOrder.items[0].status).toMatchObject({
@@ -3759,9 +3763,16 @@ describe('Order actions', () => {
     const newOrder2 = pricingService.order.calculate(order);
 
     expect(newOrder2).toHaveProperty('total', 0);
-    expect(newOrder2.status).toBe(undefined);
+    expect(newOrder2.status).toEqual({
+      paid: false,
+      picked: true,
+      order: 'open',
+    });
     expect(newOrder2.items[0].total).toBe(0);
-    expect(newOrder2.items[0].status).toBe(undefined);
+    expect(newOrder2.items[0].status).toEqual({
+      paid: undefined,
+      picked: { value: true },
+    });
   });
 
   test('Unset paid status if total is > 0  and autoMarkAsPaid: true', () => {
@@ -3785,11 +3796,15 @@ describe('Order actions', () => {
       paid: undefined,
     });
 
-    const newOrder2 = pricingService.order.calculate(order);
+    const newOrder2 = pricingService.order.calculate({
+      ...order,
+      items: [{ ...orderItem, totalPaid: 25 }],
+    });
 
     expect(newOrder2).toHaveProperty('total', 25);
     expect(newOrder2.status).toMatchObject({ paid: true });
     expect(newOrder2.items[0].total).toBe(25);
+
     expect(newOrder2.items[0].status).toMatchObject({ paid: { value: true } });
   });
 
@@ -4069,4 +4084,868 @@ describe('Order actions', () => {
       });
     });
   });
+
+  test('Should calculate order and not use invalid modifiers for adjusting a decimals difference', () => {
+    const prePay = {
+      _id: '696ff00f11527d9252127519',
+      attributes: [],
+      modifierId: '68a1005bb49860bc58c2ce90',
+      _parentId: null,
+      locked: false,
+      name: 'Prepay discount',
+      sku: '',
+      description: '',
+      group: 'Discount',
+      type: 'discount',
+      tags: ['default'],
+      order: 0,
+      included: false,
+      direct: true,
+      hidden: false,
+      print: true,
+      required: false,
+      recommended: false,
+      default: true,
+      code: '',
+      properties: {
+        override: null,
+        sort: 3,
+        isQuantityMultiplier: true,
+      },
+
+      conditions: {
+        valid: false,
+        rules: [
+          {
+            key: 'payment',
+            value: 'prepay',
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'subtract',
+        amount: 10,
+      },
+      _createdAt: '2025-08-16T22:04:11.497Z',
+      _updatedAt: '2026-01-20T21:13:15.668Z',
+      __typename: 'Modifier',
+    };
+    const ccfee = {
+      _id: '696ff00f11527d925212751a',
+      attributes: [],
+      modifierId: '68a4f71a7d9879299ccd2d53',
+      _parentId: null,
+      locked: false,
+      name: 'CC Fee',
+      sku: '',
+      description: '',
+      group: 'Fee',
+      type: 'fee',
+      tags: ['default'],
+      order: 0,
+      included: false,
+      direct: true,
+      hidden: false,
+      print: true,
+      required: true,
+      recommended: false,
+      default: false,
+      code: '',
+      properties: {
+        override: null,
+        sort: 6,
+        isQuantityMultiplier: false,
+      },
+      conditions: {
+        valid: false,
+        rules: [
+          {
+            key: 'paymentTypes',
+            value: ['credit-card'],
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'add',
+        amount: 3,
+      },
+    };
+    const tax = {
+      _id: '696ff00f11527d9252127518',
+      attributes: [],
+      modifierId: '68a10008a4582a7ef17eb3ec',
+      _parentId: null,
+      locked: false,
+      name: 'Tax 5%',
+      sku: '',
+      description: '',
+      group: 'Tax',
+      type: 'tax',
+      tags: ['default'],
+      order: 0,
+      included: false,
+      direct: true,
+      hidden: false,
+      print: false,
+      required: true,
+      recommended: false,
+      default: false,
+      code: '',
+      properties: {
+        override: null,
+        sort: 5,
+        isQuantityMultiplier: true,
+      },
+
+      conditions: {
+        valid: true,
+        rules: [],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'add',
+        amount: 5,
+      },
+    };
+
+    const order = {
+      parentId: null,
+      isParent: false,
+      subTotal: 21.5,
+      tax: 0,
+      modifiers: [],
+      discount: 0,
+      total: 22.58,
+      description: '',
+      displayId: '',
+      type: '',
+      location: {},
+      status: {
+        detailed: false,
+      },
+      attributes: [],
+      properties: {
+        pieceCount: 2,
+      },
+      fee: 0,
+      user: null,
+      items: [
+        {
+          notes: [],
+          quantity: 1,
+          pieces: 1,
+          price: 8.5,
+          serial: null,
+          description: '',
+          name: 'jacket',
+          location: {},
+          status: {
+            picked: {
+              value: false,
+              date: '',
+            },
+            paid: {
+              value: false,
+              date: '',
+            },
+            tracker: [],
+          },
+          modifiersTotalAmount: 0,
+          total: 8.93,
+          totalPaid: 0,
+          path: ',68a0ea81aa30dd1524162285,68a102e959fd1012e3aaa97e,',
+          sku: '',
+          modifiers: [prePay, ccfee, tax],
+          _id: '696ff00f11527d9252127516',
+          _updatedAt: '2026-01-20T21:05:23.179Z',
+          _createdAt: '2025-08-16T21:18:33.605Z',
+          weight: 0,
+          properties: {
+            priceChanged: true,
+          },
+          hasInventory: true,
+          inventoryType: 'push',
+          serialRequired: null,
+          tags: [],
+          category: null,
+          __typename: 'OrderItem',
+          priceLevels: [
+            {
+              value: 8.5,
+              tags: ['default'],
+            },
+            {
+              value: 6,
+              tags: ['default', 'press only'],
+            },
+          ],
+          costLevels: [],
+          itemId: '68a0f5a9a4582a7ef17ea244',
+          menuRuleId: '68a1037d59fd1012e3aaa98c',
+          subTotals: {
+            _included: 0,
+            _xincluded: 0.43,
+            _direct: 0.43,
+            _xdirect: 0,
+            _simple: 8.5,
+            _actual: 8.5,
+            tax: 0.425,
+            discount: 0.005,
+          },
+        },
+        {
+          location: {},
+          status: {
+            picked: {
+              value: false,
+              date: '',
+            },
+            paid: {
+              value: false,
+              date: '',
+            },
+            tracker: [],
+          },
+          name: 'Coat',
+          description: '',
+          pieces: 1,
+          modifiersTotalAmount: 0,
+          total: 13.65,
+          totalPaid: 0,
+          price: 13,
+          quantity: 1,
+          path: ',68a0ea81aa30dd1524162285,68a102e959fd1012e3aaa97b,',
+          notes: [],
+          serial: null,
+          sku: '',
+          modifiers: [prePay, ccfee, tax],
+          _id: '696feff511527d92521274fd',
+          _updatedAt: '2026-01-20T21:05:22.239Z',
+          _createdAt: '2025-08-16T21:19:58.509Z',
+          weight: 0,
+          properties: {},
+          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',
+          subTotals: {
+            _included: 0,
+            _xincluded: 0.65,
+            _direct: 0.65,
+            _xdirect: 0,
+            _simple: 13,
+            _actual: 13,
+            tax: 0.65,
+          },
+        },
+      ],
+      notes: [],
+      customer: {
+        _id: '68ab3e9f1a3b4b470c5fd3e4',
+      },
+
+      subTotals: {
+        tax: 1.075,
+        discount: 0.005,
+      },
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 22.58);
+    expect(newOrder).toHaveProperty('subTotal', 21.5);
+    expect(newOrder.subTotals).toEqual({ tax: 1.08 });
+  });
+
+  test('Should calculate order, patch an item and then calculate that item to confirm the patched difference is still there', () => {
+    const tax5Percent = {
+      _id: '6971272885ebcfa8a24e83cf',
+      attributes: [],
+      modifierId: '68a10008a4582a7ef17eb3ec',
+      _parentId: null,
+      locked: false,
+      name: 'Tax 5%',
+      sku: '',
+      description: '',
+      group: 'Tax',
+      type: 'tax',
+      tags: ['default'],
+      order: 0,
+      included: false,
+      direct: true,
+      hidden: false,
+      print: false,
+      required: true,
+      recommended: false,
+      default: false,
+      code: '',
+      properties: {
+        override: null,
+        sort: 5,
+        isQuantityMultiplier: true,
+      },
+      conditions: {
+        valid: true,
+        rules: [],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'add',
+        amount: 5,
+      },
+      _createdAt: '2025-08-16T22:02:48.698Z',
+      _updatedAt: '2026-01-20T20:19:08.047Z',
+      __typename: 'Modifier',
+      addModifiers: [],
+      delModifiers: [],
+    };
+    const order = {
+      subTotal: 49.5,
+      tax: 0,
+      modifiers: [
+        {
+          _id: '696fe3f0be69c4c8316cf174',
+          attributes: [],
+          modifierId: null,
+          _parentId: null,
+          locked: false,
+          name: 'Modifier 30 days (Orders Ready Fee)',
+          sku: '',
+          description: '',
+          group: 'Fee',
+          type: 'fee',
+          tags: ['default'],
+          order: 0,
+          included: false,
+          direct: true,
+          hidden: false,
+          print: true,
+          required: false,
+          recommended: false,
+          default: false,
+          code: '',
+          properties: {
+            override: null,
+            sort: 4,
+          },
+          _computed: null,
+          conditions: null,
+          compute: {
+            type: 'percentage',
+            action: 'add',
+            amount: 10,
+          },
+          _createdAt: '2026-01-20T20:22:08.072Z',
+          _updatedAt: '2026-01-20T20:22:36.398Z',
+          __typename: 'Modifier',
+          addModifiers: [],
+          delModifiers: [],
+        },
+      ],
+      total: 57.18,
+      items: [
+        {
+          name: 'Suit 2pcs',
+          total: 25.41,
+          totalPaid: 0,
+          price: 22,
+          quantity: 1,
+          modifiers: [
+            {
+              name: 'Modifier 30 days (Orders Ready Fee)',
+              sku: '',
+              description: '',
+              group: 'Fee',
+              type: 'fee',
+              attributes: [],
+              color: '',
+              backgroundColor: '',
+              icon: '',
+              url: '',
+              code: '',
+              tags: ['default'],
+              order: 0,
+              included: false,
+              direct: false,
+              hidden: false,
+              required: false,
+              print: true,
+              delModifiers: [],
+              addModifiers: [],
+              conditions: {
+                valid: true,
+              },
+              compute: {
+                type: 'fixed',
+                amount: 2.2,
+                action: 'add',
+              },
+              properties: {
+                override: null,
+                sort: 4,
+                isQuantityMultiplier: false,
+              },
+              _id: '6971275b85ebcfa8a24e83e5',
+              modifierId: '696fe3f0be69c4c8316cf174',
+              __typename: 'Modifier',
+              _parentId: '696fe3f0be69c4c8316cf174',
+              locked: false,
+              recommended: false,
+              default: false,
+              _computed: {
+                amount: 2.2,
+                description: 'Modifier 30 days (Orders Ready Fee) ($2.20)',
+              },
+              _createdAt: '2026-01-20T20:22:08.072Z',
+              _updatedAt: '2026-01-20T20:22:36.398Z',
+            },
+            tax5Percent,
+          ],
+          _id: '6971272d85ebcfa8a24e83dc',
+          _updatedAt: '2026-01-21T15:56:58.479Z',
+          _createdAt: '2025-08-16T21:14:15.065Z',
+          weight: 0,
+          properties: {},
+          hasInventory: true,
+          inventoryType: 'push',
+          serialRequired: null,
+          tags: [],
+          category: {
+            _id: '68a0ea8359fd1012e3aaa823',
+          },
+          __typename: 'OrderItem',
+          priceLevels: [
+            {
+              value: 22,
+              tags: ['default'],
+            },
+            {
+              value: 18,
+              tags: ['default', 'press only'],
+            },
+          ],
+          costLevels: [],
+          itemId: '68a0f4a7aa30dd1524162cea',
+          categoryId: '68a0ea8359fd1012e3aaa823',
+          menuRuleId: '68a1034959fd1012e3aaa986',
+          subTotals: {
+            _included: 0,
+            _xincluded: 3.41,
+            _direct: 1.21,
+            _xdirect: 2.2,
+            _simple: 22,
+            _actual: 22,
+            fee: 2.2,
+            tax: 1.21,
+          },
+        },
+        {
+          location: {},
+          status: {
+            picked: {
+              value: false,
+              date: '',
+            },
+            paid: {
+              value: false,
+              date: '',
+            },
+            tracker: [],
+          },
+          name: 'Vest',
+          description: '',
+          pieces: 1,
+          modifiersTotalAmount: 0,
+          total: 6.93,
+          totalPaid: 0,
+          price: 6,
+          quantity: 1,
+          path: ',68a0ea81aa30dd1524162285,68a102e959fd1012e3aaa981,',
+          notes: [],
+          serial: 'Test0000005576',
+          sku: '',
+          modifiers: [
+            {
+              name: 'Modifier 30 days (Orders Ready Fee)',
+              sku: '',
+              description: '',
+              group: 'Fee',
+              type: 'fee',
+              attributes: [],
+              color: '',
+              backgroundColor: '',
+              icon: '',
+              url: '',
+              code: '',
+              tags: ['default'],
+              order: 0,
+              included: false,
+              direct: false,
+              hidden: false,
+              required: false,
+              print: true,
+              delModifiers: [],
+              addModifiers: [],
+              conditions: {
+                valid: true,
+              },
+              compute: {
+                type: 'fixed',
+                amount: 0.6,
+                action: 'add',
+              },
+              properties: {
+                override: null,
+                sort: 4,
+                isQuantityMultiplier: false,
+              },
+              _id: '6971275b85ebcfa8a24e83e6',
+              modifierId: '696fe3f0be69c4c8316cf174',
+              __typename: 'Modifier',
+              _parentId: '696fe3f0be69c4c8316cf174',
+              locked: false,
+              recommended: false,
+              default: false,
+              _computed: {
+                amount: 0.6,
+                description: 'Modifier 30 days (Orders Ready Fee) ($0.60)',
+              },
+              _createdAt: '2026-01-20T20:22:08.072Z',
+              _updatedAt: '2026-01-20T20:22:36.398Z',
+            },
+            tax5Percent,
+          ],
+          _id: '6971272c85ebcfa8a24e83d7',
+          _updatedAt: '2026-01-21T19:07:53.556Z',
+          _createdAt: '2025-08-16T21:23:40.809Z',
+          weight: 0,
+          properties: {},
+          hasInventory: true,
+          inventoryType: 'push',
+          serialRequired: null,
+          tags: [],
+          category: null,
+          __typename: 'OrderItem',
+          priceLevels: [
+            {
+              value: 6,
+              tags: ['default'],
+            },
+            {
+              value: 5,
+              tags: ['default', 'press only'],
+            },
+          ],
+          costLevels: [],
+          itemId: '68a0f6dca4582a7ef17ea70b',
+          menuRuleId: '68a1039f59fd1012e3aaa991',
+          subTotals: {
+            _included: 0,
+            _xincluded: 0.93,
+            _direct: 0.33,
+            _xdirect: 0.6,
+            _simple: 6,
+            _actual: 6,
+            fee: 0.6,
+            tax: 0.33,
+          },
+        },
+        {
+          location: {},
+          status: {
+            picked: {
+              value: false,
+              date: '',
+            },
+            paid: {
+              value: false,
+              date: '',
+            },
+            tracker: [],
+          },
+          name: 'Jacket',
+          description: '',
+          pieces: 1,
+          modifiersTotalAmount: 0,
+          total: 9.82,
+          totalPaid: 0,
+          price: 8.5,
+          quantity: 1,
+          path: ',68a0ea81aa30dd1524162285,68a102e959fd1012e3aaa97e,',
+          notes: [],
+          serial: 'Test0000005575',
+          sku: '',
+          modifiers: [
+            {
+              name: 'Modifier 30 days (Orders Ready Fee)',
+              sku: '',
+              description: '',
+              group: 'Fee',
+              type: 'fee',
+              attributes: [],
+              color: '',
+              backgroundColor: '',
+              icon: '',
+              url: '',
+              code: '',
+              tags: ['default'],
+              order: 0,
+              included: false,
+              direct: false,
+              hidden: false,
+              required: false,
+              print: true,
+              delModifiers: [],
+              addModifiers: [],
+              conditions: {
+                valid: true,
+              },
+              compute: {
+                type: 'fixed',
+                amount: 0.85,
+                action: 'add',
+              },
+              properties: {
+                override: null,
+                sort: 4,
+                isQuantityMultiplier: false,
+              },
+              _id: '6971275b85ebcfa8a24e83e7',
+              modifierId: '696fe3f0be69c4c8316cf174',
+              __typename: 'Modifier',
+              _parentId: '696fe3f0be69c4c8316cf174',
+              locked: false,
+              recommended: false,
+              default: false,
+              _computed: {
+                amount: 0.85,
+                description: 'Modifier 30 days (Orders Ready Fee) ($0.85)',
+              },
+              _createdAt: '2026-01-20T20:22:08.072Z',
+              _updatedAt: '2026-01-20T20:22:36.398Z',
+            },
+            {
+              ...tax5Percent,
+              properties: {
+                ...tax5Percent.properties,
+              },
+            },
+          ],
+          _id: '6971272a85ebcfa8a24e83d2',
+          _updatedAt: '2026-01-21T18:58:30.611Z',
+          _createdAt: '2025-08-16T21:18:33.605Z',
+          weight: 0,
+          properties: {},
+          hasInventory: true,
+          inventoryType: 'push',
+          serialRequired: null,
+          tags: [],
+          category: null,
+          __typename: 'OrderItem',
+          priceLevels: [
+            {
+              value: 8.5,
+              tags: ['default'],
+            },
+            {
+              value: 6,
+              tags: ['default', 'press only'],
+            },
+          ],
+          costLevels: [],
+          itemId: '68a0f5a9a4582a7ef17ea244',
+          menuRuleId: '68a1037d59fd1012e3aaa98c',
+          subTotals: {
+            _included: 0,
+            _xincluded: 1.3225,
+            _direct: 0.4725,
+            _xdirect: 0.85,
+            _simple: 8.5,
+            _actual: 8.5,
+            fee: 0.85,
+            tax: 0.4725,
+          },
+        },
+        {
+          location: {},
+          status: {
+            picked: {
+              value: false,
+              date: '',
+            },
+            paid: {
+              value: false,
+              date: '',
+            },
+            tracker: [],
+          },
+          name: 'Coat',
+          description: '',
+          pieces: 1,
+          modifiersTotalAmount: 0,
+          total: 15.02,
+          totalPaid: 0,
+          price: 13,
+          quantity: 1,
+          path: ',68a0ea81aa30dd1524162285,68a102e959fd1012e3aaa97b,',
+          notes: [],
+          serial: 'Test0000005574',
+          sku: '',
+          modifiers: [
+            {
+              name: 'Modifier 30 days (Orders Ready Fee)',
+              sku: '',
+              description: '',
+              group: 'Fee',
+              type: 'fee',
+              attributes: [],
+              color: '',
+              backgroundColor: '',
+              icon: '',
+              url: '',
+              code: '',
+              tags: ['default'],
+              order: 0,
+              included: false,
+              direct: false,
+              hidden: false,
+              required: false,
+              print: true,
+              delModifiers: [],
+              addModifiers: [],
+              conditions: {
+                valid: true,
+              },
+              compute: {
+                type: 'fixed',
+                amount: 1.3,
+                action: 'add',
+              },
+              properties: {
+                override: null,
+                sort: 4,
+                isQuantityMultiplier: false,
+              },
+              _id: '6971275b85ebcfa8a24e83e8',
+              modifierId: '696fe3f0be69c4c8316cf174',
+              __typename: 'Modifier',
+              _parentId: '696fe3f0be69c4c8316cf174',
+              locked: false,
+              recommended: false,
+              default: false,
+              _computed: {
+                amount: 1.3,
+                description: 'Modifier 30 days (Orders Ready Fee) ($1.30)',
+              },
+              _createdAt: '2026-01-20T20:22:08.072Z',
+              _updatedAt: '2026-01-20T20:22:36.398Z',
+            },
+            tax5Percent,
+          ],
+          _id: '6971272885ebcfa8a24e83cd',
+          _updatedAt: '2026-01-21T18:58:30.490Z',
+          _createdAt: '2025-08-16T21:19:58.509Z',
+          weight: 0,
+          properties: {},
+          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',
+          subTotals: {
+            _included: 0,
+            _xincluded: 2.015,
+            _direct: 0.715,
+            _xdirect: 1.3,
+            _simple: 13,
+            _actual: 13,
+            fee: 1.3,
+            tax: 0.715,
+          },
+        },
+      ],
+      customer: {
+        _id: '68ab3e9f1a3b4b470c5fd3e4',
+      },
+      subTotals: {
+        fee: 4.95,
+        tax: 2.7275,
+      },
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 57.18);
+    expect(newOrder).toHaveProperty('subTotal', 49.5);
+    expect(newOrder.subTotals).toEqual({ fee: 4.946, tax: 2.7225 });
+    expect(newOrder.items[0].total).toEqual(25.41);
+    expect(newOrder.items[1].total).toEqual(6.93);
+    expect(newOrder.items[2].total).toEqual(9.82);
+    expect(newOrder.items[3].total).toEqual(15.02);
+
+    const itemPatched = pricingService.item.calculate(newOrder.items[2]);
+    expect(itemPatched.total).toEqual(9.82);
+
+    const newOrder2 = pricingService.order.calculate(newOrder);
+
+    expect(newOrder2).toHaveProperty('total', 57.18);
+    expect(newOrder2).toHaveProperty('subTotal', 49.5);
+    expect(newOrder2.subTotals).toEqual({ fee: 4.946, tax: 2.7225 });
+    expect(newOrder2.items[0].total).toEqual(25.41);
+    expect(newOrder2.items[1].total).toEqual(6.93);
+    expect(newOrder2.items[2].total).toEqual(9.82);
+    expect(newOrder2.items[3].total).toEqual(15.02);
+
+    const itemPatched2 = pricingService.item.calculate(newOrder2.items[2]);
+    expect(itemPatched2.total).toEqual(9.82);
+  });
 });