Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix handling auth/capture flow in Payment Sessions webhooks flow (#14014)
Damian Legawiec7fa5446d207a
diff --git a/spree/core/app/services/spree/payments/handle_webhook.rb b/spree/core/app/services/spree/payments/handle_webhook.rbindex f441374bb9..5ed18a1649 100644--- a/spree/core/app/services/spree/payments/handle_webhook.rb+++ b/spree/core/app/services/spree/payments/handle_webhook.rb@@ -28,6 +28,8 @@ module Spreeprivate+ # `Spree::Payment#confirm!` honors the payment method's `auto_capture?` setting:+ # auto_capture → complete! + capture_event; otherwise → pend! (auth-only, payment_state=balance_due).def handle_success(payment_session, order, metadata)order.with_lock do# Idempotency: if the session was already completed (by the API@@ -36,19 +38,10 @@ module Spreereturn success(payment_session)end- # Ensure payment record existspayment = payment_session.find_or_create_payment!(metadata)-- # Mark payment as completed — the webhook confirms the gateway processed it- if payment.present? && !payment.completed?- payment.started_processing! if payment.checkout?- payment.complete! if payment.can_complete?- end-- # Mark session as completed+ payment.confirm! if payment.present? && !payment.completed?payment_session.complete if payment_session.can_complete?- # Complete order if not already doneunless order.reload.completed?Spree::Dependencies.carts_complete_service.constantize.call(cart: order)enddiff --git a/spree/core/spec/services/spree/payments/handle_webhook_spec.rb b/spree/core/spec/services/spree/payments/handle_webhook_spec.rbindex d921ef12a5..174501f602 100644--- a/spree/core/spec/services/spree/payments/handle_webhook_spec.rb+++ b/spree/core/spec/services/spree/payments/handle_webhook_spec.rb@@ -27,10 +27,18 @@ RSpec.describe Spree::Payments::HandleWebhook doexpect(payment_session.reload.status).to eq('completed')end- it 'completes the order' do+ it 'completes the payment' dosubject.call(payment_method: payment_method, action: :captured, payment_session: payment_session)- expect(order.reload.state).to eq('complete')+ expect(order.reload.payments.first.state).to eq('completed')+ end++ it 'completes the order with payment_state=paid' do+ subject.call(payment_method: payment_method, action: :captured, payment_session: payment_session)++ order.reload+ expect(order.state).to eq('complete')+ expect(order.payment_state).to eq('paid')endit 'returns success' do@@ -40,13 +48,29 @@ RSpec.describe Spree::Payments::HandleWebhook doendend- context 'with :authorized action' do- it 'creates a payment record and completes the order' do+ context 'with :authorized action and a manual-capture payment method' do+ let(:payment_method) { create(:bogus_payment_method, stores: [store], auto_capture: false) }++ it 'creates a payment record in pending state' doresult = subject.call(payment_method: payment_method, action: :authorized, payment_session: payment_session)expect(result).to be_success- expect(payment_session.reload.status).to eq('completed')expect(order.reload.payments.count).to eq(1)+ expect(order.payments.first.state).to eq('pending')+ end++ it 'completes the payment session' do+ subject.call(payment_method: payment_method, action: :authorized, payment_session: payment_session)++ expect(payment_session.reload.status).to eq('completed')+ end++ it 'completes the order but leaves payment_state as balance_due (funds on hold, not captured)' do+ subject.call(payment_method: payment_method, action: :authorized, payment_session: payment_session)++ order.reload+ expect(order.state).to eq('complete')+ expect(order.payment_state).to eq('balance_due')endend