fix(core-flows): capture before order created

.changeset/thirty-lamps-collect.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/core-flows": patch
+"@medusajs/medusa": patch
+---
+
+Create Order before payment capture

packages/core/core-flows/src/payment/workflows/index.ts

@@ -1,5 +1,3 @@
 export * from "./capture-payment"
-export * from "./on-payment-processed"
 export * from "./process-payment"
 export * from "./refund-payment"
-

packages/core/core-flows/src/payment/workflows/process-payment.ts

@@ -1,6 +1,7 @@
 import { WebhookActionResult } from "@medusajs/types"
 import { PaymentActions } from "@medusajs/utils"
 import { createWorkflow, when } from "@medusajs/workflows-sdk"
+import { completeCartWorkflow } from "../../cart/workflows/complete-cart"
 import { useQueryStep } from "../../common/steps/use-query"
 import { authorizePaymentSessionStep } from "../steps"
 import { capturePaymentWorkflow } from "./capture-payment"
@@ -15,6 +16,41 @@ export const processPaymentWorkflow = createWorkflow(
       entity: "payment",
       fields: ["id"],
       filters: { payment_session_id: input.data?.session_id },
+    }).config({
+      name: "payment-query",
+    })
+
+    const paymentSessionResult = useQueryStep({
+      entity: "payment_session",
+      fields: ["payment_collection_id"],
+      filters: { id: input.data?.session_id },
+    }).config({
+      name: "payment-session-query",
+    })
+
+    const cartPaymentCollection = useQueryStep({
+      entity: "cart_payment_collection",
+      fields: ["cart_id"],
+      filters: {
+        payment_collection_id:
+          paymentSessionResult.data[0].payment_collection_id,
+      },
+    }).config({
+      name: "cart-payment-query",
+    })
+
+    when({ cartPaymentCollection }, ({ cartPaymentCollection }) => {
+      return !!cartPaymentCollection.data.length
+    }).then(() => {
+      completeCartWorkflow
+        .runAsStep({
+          input: {
+            id: cartPaymentCollection.data[0].cart_id,
+          },
+        })
+        .config({
+          continueOnPermanentFailure: true, // Continue payment processing even if cart completion fails
+        })
     })
 
     when({ input }, ({ input }) => {
@@ -31,8 +67,12 @@ export const processPaymentWorkflow = createWorkflow(
     })
 
     when({ input }, ({ input }) => {
+      // Authorize payment session if no Cart is linked to the payment
+      // When associated with a Cart, the complete cart workflow will handle the authorization
       return (
-        input.action === PaymentActions.AUTHORIZED && !!input.data?.session_id
+        !cartPaymentCollection.data.length &&
+        input.action === PaymentActions.AUTHORIZED &&
+        !!input.data?.session_id
       )
     }).then(() => {
       authorizePaymentSessionStep({

packages/medusa/src/subscribers/payment-webhook.ts

@@ -1,7 +1,4 @@
-import {
-  onPaymentProcessedWorkflow,
-  processPaymentWorkflow,
-} from "@medusajs/core-flows"
+import { processPaymentWorkflow } from "@medusajs/core-flows"
 import {
   IPaymentModuleService,
   ProviderWebhookPayload,
@@ -29,7 +26,7 @@ export default async function paymentWebhookhandler({
   const input = event.data
 
   if (
-    (input.payload.rawData as unknown as SerializedBuffer).type === "Buffer"
+    (input.payload?.rawData as unknown as SerializedBuffer)?.type === "Buffer"
   ) {
     input.payload.rawData = Buffer.from(
       (input.payload.rawData as unknown as SerializedBuffer).data
@@ -49,11 +46,6 @@ export default async function paymentWebhookhandler({
   await processPaymentWorkflow(container).run({
     input: processedEvent,
   })
-
-  // We process the intended side effects of payment processing separately.
-  await onPaymentProcessedWorkflow(container).run({
-    input: processedEvent,
-  })
 }
 
 export const config: SubscriberConfig = {