Merge branch 'develop' into patch-1

medusajs · Nov 26, 2024 · 62cb853 · 62cb853
2 parents 5de501d + a8eec16
commit 62cb853
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/packages/core/core-flows/src/order/utils/__tests__/aggregate-status.spec.ts b/packages/core/core-flows/src/order/utils/__tests__/aggregate-status.spec.ts
@@ -100,6 +100,16 @@ describe("Aggregate Order Status", () => {
       } as any)
     ).toEqual("captured")
 
+    expect(
+      getLastPaymentStatus({
+        payment_collections: [
+          { status: "authorized", captured_amount: 0, amount: 0 },
+          { status: "authorized", captured_amount: 12, amount: 12 },
+          { status: "canceled" },
+        ],
+      } as any)
+    ).toEqual("captured")
+
     expect(
       getLastPaymentStatus({
         payment_collections: [

diff --git a/packages/core/core-flows/src/order/utils/aggregate-status.ts b/packages/core/core-flows/src/order/utils/aggregate-status.ts
@@ -21,7 +21,11 @@ export const getLastPaymentStatus = (order: OrderDetailDTO) => {
   }
 
   for (const paymentCollection of order.payment_collections) {
-    if (MathBN.gt(paymentCollection.captured_amount ?? 0, 0)) {
+    if (
+      MathBN.gt(paymentCollection.captured_amount ?? 0, 0) ||
+      (isDefined(paymentCollection.amount) &&
+        MathBN.eq(paymentCollection.amount, 0))
+    ) {
       paymentStatus[PaymentStatus.CAPTURED] += MathBN.eq(
         paymentCollection.captured_amount as number,
         paymentCollection.amount