diff --git a/backend/apps/backend/src/api/hooks/mollie/route.ts b/backend/apps/backend/src/api/hooks/mollie/route.ts index f3fee72..a567b14 100644 --- a/backend/apps/backend/src/api/hooks/mollie/route.ts +++ b/backend/apps/backend/src/api/hooks/mollie/route.ts @@ -2,6 +2,7 @@ import { MedusaRequest, MedusaResponse } from "@medusajs/framework/http"; import { completeCartWorkflow, createPaymentCollectionForCartWorkflow, + createPaymentSessionsWorkflow, capturePaymentWorkflow, } from "@medusajs/core-flows"; import { getPayment, findValidMandate } from "../../../lib/mollie"; @@ -61,7 +62,12 @@ export async function POST(req: MedusaRequest, res: MedusaResponse) { const { data: carts } = await query.graph({ entity: "cart", - fields: [...SUBSCRIPTION_CART_FIELDS, "completed_at"], + fields: [ + ...SUBSCRIPTION_CART_FIELDS, + "completed_at", + "payment_collection.id", + "payment_collection.payment_sessions.id", + ], filters: { id: cartId }, }); const cart: any = carts?.[0]; @@ -83,9 +89,22 @@ export async function POST(req: MedusaRequest, res: MedusaResponse) { return res.status(200).send("ok"); } - await createPaymentCollectionForCartWorkflow(req.scope).run({ - input: { cart_id: cartId }, - }); + // Ein früherer Aufruf kann Sammlung und Sitzung schon angelegt haben und + // erst danach gescheitert sein — dann weiterverwenden statt neu anlegen. + let collectionId = cart.payment_collection?.id; + if (!collectionId) { + const { result: sammlung } = await createPaymentCollectionForCartWorkflow(req.scope).run({ + input: { cart_id: cartId }, + }); + collectionId = (sammlung as any).id; + } + // Ohne Zahlungssitzung lässt sich der Warenkorb nicht abschließen. Wie im + // Abo-Job über den manuellen Anbieter: Das Geld hat Mollie schon. + if (!cart.payment_collection?.payment_sessions?.length) { + await createPaymentSessionsWorkflow(req.scope).run({ + input: { payment_collection_id: collectionId, provider_id: "pp_system_default" }, + }); + } const { result: completed } = await completeCartWorkflow(req.scope).run({ input: { id: cartId }, }); @@ -132,8 +151,10 @@ export async function POST(req: MedusaRequest, res: MedusaResponse) { res.status(200).send("ok"); } catch (error) { logger.error( + // Workflows werfen teils schlichte Objekte statt Error — String() ergäbe + // dann nur "[object Object]". `[mollie] Webhook ${paymentId} fehlgeschlagen: ${ - error instanceof Error ? error.message : String(error) + error instanceof Error ? error.message : (error as any)?.message ?? JSON.stringify(error) }` ); // Bewusst 200: sonst wiederholt Mollie endlos, obwohl der Fehler bei uns diff --git a/backend/apps/backend/src/api/store/subscriptions/checkout/route.ts b/backend/apps/backend/src/api/store/subscriptions/checkout/route.ts index bb443c4..8d0fdad 100644 --- a/backend/apps/backend/src/api/store/subscriptions/checkout/route.ts +++ b/backend/apps/backend/src/api/store/subscriptions/checkout/route.ts @@ -58,7 +58,9 @@ export async function POST(req: MedusaRequest, res: MedusaResponse) { const { data: carts } = await query.graph({ entity: "cart", - fields: [...SUBSCRIPTION_CART_FIELDS, "total"], + // Ohne Preise der Posten und Versandarten rechnet Medusa total = 0, und + // Mollie zieht 0,00 € statt der ersten Lieferung. + fields: [...SUBSCRIPTION_CART_FIELDS, "total", "items.*", "shipping_methods.*"], filters: { id: body.cart_id }, }); const cart: any = carts?.[0]; diff --git a/compose.prod.yml b/compose.prod.yml index a4090a6..6ce01ad 100644 --- a/compose.prod.yml +++ b/compose.prod.yml @@ -103,6 +103,10 @@ services: DHL_SHIPPER_CITY: ${DHL_SHIPPER_CITY:-} DHL_SHIPPER_COUNTRY: ${DHL_SHIPPER_COUNTRY:-} MOLLIE_API_KEY: ${MOLLIE_API_KEY:-} + # Frontend und Backend teilen sich die Domain. Ohne diese beiden schickt + # Mollie den Kunden nach localhost zurück und meldet die Zahlung nie. + MOLLIE_WEBHOOK_URL: ${MEDUSA_BACKEND_URL}/hooks/mollie + STOREFRONT_URL: ${MEDUSA_BACKEND_URL} SMTP_HOST: ${SMTP_HOST:-} SMTP_PORT: ${SMTP_PORT:-} SMTP_USER: ${SMTP_USER:-}