@darkpos/pricing 1.0.148 → 1.0.150

package/__TEST__/invoice/refundInvoices.test.js

@@ -197,6 +197,133 @@ describe('applyRefundToInvoices', () => {
   });
 });
 
+describe('applyRefundToInvoices — 5-item order with 3 items priced to 0', () => {
+  const ORDER_5_ID = 'order-5items';
+
+  // Items as they appear in the payment invoice (stale totals from payment time)
+  const shortsInvoiceItem = {
+    orderId: ORDER_5_ID,
+    orderItemId: 'shorts',
+    total: 6.3,
+    totalPaid: 6.3,
+    amount: 6.3,
+    status: { paid: { value: true } },
+  };
+  const jacket1InvoiceItem = {
+    orderId: ORDER_5_ID,
+    orderItemId: 'jacket-1',
+    total: 8.93,
+    totalPaid: 8.93,
+    amount: 8.93,
+    status: { paid: { value: true } },
+  };
+  const longJacketInvoiceItem = {
+    orderId: ORDER_5_ID,
+    orderItemId: 'long-jacket',
+    total: 12.6,
+    totalPaid: 12.6,
+    amount: 12.6,
+    status: { paid: { value: true } },
+  };
+  const jacket2InvoiceItem = {
+    orderId: ORDER_5_ID,
+    orderItemId: 'jacket-2',
+    total: 8.93,
+    totalPaid: 8.93,
+    amount: 8.93,
+    status: { paid: { value: true } },
+  };
+  const coatInvoiceItem = {
+    orderId: ORDER_5_ID,
+    orderItemId: 'coat',
+    total: 13.65,
+    totalPaid: 3.24,
+    amount: 3.24,
+    status: { paid: { value: false } },
+  };
+
+  // Live order state after Jacket×2 and Long Jacket prices changed to 0
+  const liveOrder5 = {
+    _id: ORDER_5_ID,
+    items: [
+      {
+        _id: 'shorts',
+        total: 6.3,
+        totalPaid: 6.3,
+        status: { paid: { value: true } },
+      },
+      {
+        _id: 'jacket-1',
+        total: 0,
+        totalPaid: 8.93,
+        status: { paid: { value: true } },
+      },
+      {
+        _id: 'long-jacket',
+        total: 0,
+        totalPaid: 12.6,
+        status: { paid: { value: true } },
+      },
+      {
+        _id: 'jacket-2',
+        total: 0,
+        totalPaid: 8.93,
+        status: { paid: { value: true } },
+      },
+      {
+        _id: 'coat',
+        total: 13.65,
+        totalPaid: 3.24,
+        status: { paid: { value: false } },
+      },
+    ],
+  };
+
+  const ordersById5 = { [ORDER_5_ID]: liveOrder5 };
+
+  const paymentInvoices5 = [
+    {
+      invoiceId: 'inv-5items',
+      amount: 40,
+      paymentOrderItems: [
+        shortsInvoiceItem,
+        jacket1InvoiceItem,
+        longJacketInvoiceItem,
+        jacket2InvoiceItem,
+        coatInvoiceItem,
+      ],
+    },
+  ];
+
+  test('correctly refunds 20.05 — clears the 3 zero-priced items and credits the remaining balance to coat', () => {
+    const refundInvoices = pricing.invoice.applyRefundToInvoices(
+      paymentInvoices5,
+      ordersById5,
+      20.05
+    );
+
+    expect(refundInvoices).toHaveLength(1);
+    expect(refundInvoices[0].amount).toBe(-20.05);
+    expect(refundInvoices[0].paymentOrderItems).toHaveLength(4); // shorts has 0 excess, skipped
+
+    const byItemId = Object.fromEntries(
+      refundInvoices[0].paymentOrderItems.map(item => [item.orderItemId, item])
+    );
+
+    expect(byItemId['jacket-1'].amount).toBe(-8.93);
+    expect(byItemId['jacket-1'].status.paid.value).toBe(true);
+
+    expect(byItemId['long-jacket'].amount).toBe(-12.6);
+    expect(byItemId['long-jacket'].status.paid.value).toBe(true);
+
+    expect(byItemId['jacket-2'].amount).toBe(-8.93);
+    expect(byItemId['jacket-2'].status.paid.value).toBe(true);
+
+    expect(byItemId.coat.amount).toBe(10.41);
+    expect(byItemId.coat.status.paid.value).toBe(true);
+  });
+});
+
 describe('buildItemRefund', () => {
   const overpaidItemState = pricing.invoice.resolveItemState(
     overpaidInvoiceItem,

package/__TEST__/order/hasSerial.test.js

@@ -77,6 +77,29 @@ describe('hasSerial function', () => {
     expect(result).toBe(false);
   });
 
+  test('returns false when the matching serial belongs to a pending item', () => {
+    const { hasSerial } = pricingService.order;
+
+    const order = {
+      items: [
+        {
+          _id: '1',
+          serial: 'ABC-123',
+          isPending: true,
+        },
+      ],
+    };
+
+    const item = {
+      _id: '2',
+      serial: 'ABC-123',
+    };
+
+    const result = hasSerial({ order, item });
+
+    expect(result).toBe(false);
+  });
+
   test('returns false when order or item is missing', () => {
     const { hasSerial } = pricingService.order;
 

package/lib/invoice/resolveItemState.js

@@ -7,10 +7,10 @@ module.exports = ({ utils }) => {
       each => each._id === paymentOrderItem.orderItemId
     );
 
-    const itemTotal =
-      (orderItem && orderItem.total) || paymentOrderItem.total || 0;
-    const itemTotalPaid =
-      (orderItem && orderItem.totalPaid) || paymentOrderItem.totalPaid || 0;
+    const itemTotal = orderItem ? orderItem.total : paymentOrderItem.total || 0;
+    const itemTotalPaid = orderItem
+      ? orderItem.totalPaid
+      : paymentOrderItem.totalPaid || 0;
     const currentStatus =
       (orderItem && orderItem.status) || paymentOrderItem.status || {};
 

package/lib/item/index.js

@@ -69,6 +69,7 @@ const applyNotesOverridesToItem = require('./applyNotesOverridesToItem');
 const getModifiersToNotCompute = require('./getModifiersToNotCompute');
 const getSplitDepartment = require('./getSplitDepartment');
 const isPriceChanged = require('./isPriceChanged');
+const isPending = require('./isPending');
 const isSerialRequired = require('./isSerialRequired');
 const isSerialLengthValid = require('./isSerialLengthValid');
 const getSerialStatus = require('./getSerialStatus');
@@ -166,6 +167,7 @@ const itemActions = (deps = {}) => {
     getModifiersToNotCompute: getModifiersToNotCompute(innerDeps),
     getSplitDepartment: getSplitDepartment(innerDeps),
     isPriceChanged: isPriceChanged(innerDeps),
+    isPending: isPending(innerDeps),
     isSerialRequired: isSerialRequired(innerDeps),
     isSerialLengthValid: isSerialLengthValid(innerDeps),
     getSerialStatus: getSerialStatus(innerDeps),

package/lib/item/isPending.js

@@ -0,0 +1,4 @@
+module.exports = () =>
+  function isPending(item) {
+    return !!(item && item.isPending);
+  };

package/lib/order/addItem.js

@@ -130,11 +130,12 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
 
     const pendingItem = actions.getSelectedItem({ order, itemIndex });
 
-    if (pendingItem && pendingItem.isPending && !combined) {
+    if (pendingItem && itemActions.isPending(pendingItem) && !combined) {
       idx = itemIndex;
       combined = !!pendingItem.itemId;
       orderItem.quantity = pendingItem.quantity;
-      orderItem.isPending = orderItem.isPending || !orderItem.itemId;
+      orderItem.isPending =
+        itemActions.isPending(orderItem) || !orderItem.itemId;
       // add inventory
       if (pendingItem.inventory) {
         const inventory = getInventory(pendingItem);

package/lib/order/getOverpaidAmount.js

@@ -1,8 +1,13 @@
 module.exports = ({ utils }) =>
   function getOverPaidAmount({ order }) {
     if (!order) return 0;
-    const total = Number(order.total || 0);
-    const totalPaid = Number(order.totalPaid || 0);
 
-    return utils.math.sub(totalPaid, total);
+    return (order.items || []).reduce((net, item) => {
+      const itemTotalPaid = Number(item.totalPaid || 0);
+      if (itemTotalPaid <= 0) return net;
+      return utils.math.add(
+        net,
+        utils.math.sub(itemTotalPaid, Number(item.total || 0))
+      );
+    }, 0);
   };

package/lib/order/hasSerial.js

@@ -21,7 +21,9 @@ module.exports = ({ itemActions }) =>
     return order.items
       .filter(
         orderItem =>
-          orderItem._id !== item._id && !itemActions.isRelatedItem(orderItem)
+          orderItem._id !== item._id &&
+          !itemActions.isRelatedItem(orderItem) &&
+          !itemActions.isPending(orderItem)
       )
       .some(
         orderItem => normalizeSerial(orderItem.serial) === normalizedSerial

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.148",
+  "version": "1.0.150",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -54,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "ef7e78a71a5fb6cfd619b8f525b7950669bd7995"
+  "gitHead": "5ba2aa85fa455644dfa228072d30f8a8560d161c"
 }