@darkpos/pricing 1.0.153 → 1.0.154

package/__TEST__/payment.test.js

@@ -135,6 +135,21 @@ describe('getOverPaidOrders tests', () => {
     expect(result.overPaidOrders).toHaveLength(0);
     expect(result.overPaidAmount).toBe(0);
   });
+
+  test('includes a void order paid exactly to its total as refundable', () => {
+    const order = pricingService.order.voidOrder({
+      ...baseOrder,
+      totalPaid: 30,
+    });
+
+    const result = pricingService.payment.getOverPaidOrders({
+      orders: [order],
+    });
+
+    expect(result.overPaidOrders).toHaveLength(1);
+    expect(result.overPaidOrders[0].refundableAmount).toBe(30);
+    expect(result.overPaidAmount).toBe(30);
+  });
 });
 
 describe('capOverPaidItem tests', () => {

package/lib/payment/getOverPaidOrders.js

@@ -3,17 +3,20 @@ module.exports = ({ orderActions, utils }) =>
     const overPaidOrders = [];
     let overPaidAmount = 0;
 
-    const appendIfOverPaid = currentOrder => {
+    const appendIfRefundable = currentOrder => {
       const overPaidTotal = orderActions.getOverPaidAmount({
         order: currentOrder,
       });
+      const refundableAmount = orderActions.isVoid(currentOrder)
+        ? currentOrder.totalPaid || 0
+        : overPaidTotal;
 
-      if (overPaidTotal > 0) {
+      if (refundableAmount > 0) {
         overPaidOrders.push({
           ...currentOrder,
-          refundableAmount: overPaidTotal,
+          refundableAmount,
         });
-        overPaidAmount = utils.math.add(overPaidAmount, overPaidTotal);
+        overPaidAmount = utils.math.add(overPaidAmount, refundableAmount);
       }
     };
 
@@ -23,12 +26,12 @@ module.exports = ({ orderActions, utils }) =>
         const childOrders = order.orders || [];
 
         if (childOrders.length > 0) {
-          childOrders.forEach(appendIfOverPaid);
+          childOrders.forEach(appendIfRefundable);
           return;
         }
       }
 
-      appendIfOverPaid(order);
+      appendIfRefundable(order);
     });
 
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.153",
+  "version": "1.0.154",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -54,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "495fd0beca96603861fccf52ba2a5618fc632e7a"
+  "gitHead": "6d06392dd10f6fba50228db77331e4073cf2e3bf"
 }