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
Add `confirmation_required?` to payment methods and use it in `Spree::Order#confirmation_required?` (#13169)
Łukasz Adamczyk203df91d90aa
diff --git a/core/app/models/spree/gateway/bogus.rb b/core/app/models/spree/gateway/bogus.rbindex eca35e8e5d..490b328ba2 100644--- a/core/app/models/spree/gateway/bogus.rb+++ b/core/app/models/spree/gateway/bogus.rb@@ -72,6 +72,10 @@ module Spreetrueend+ def confirmation_required?+ true+ end+def payment_profiles_supported?trueenddiff --git a/core/app/models/spree/gateway/custom_payment_source_method.rb b/core/app/models/spree/gateway/custom_payment_source_method.rbindex 53d4bab8cf..ed647f5f5f 100644--- a/core/app/models/spree/gateway/custom_payment_source_method.rb+++ b/core/app/models/spree/gateway/custom_payment_source_method.rb@@ -8,6 +8,10 @@ module SpreeSpree::PaymentSourceend+ def confirmation_required?+ true+ end+def payment_profiles_supported?trueenddiff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex ff762065a0..2b6676b40b 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -302,7 +302,7 @@ module Spree# If true, causes the confirmation step to happen during the checkout processdef confirmation_required?Spree::Config[:always_include_confirm_step] ||- payments.valid.map(&:payment_method).compact.any?(&:payment_profiles_supported?) ||+ payments.valid.map(&:payment_method).compact.any?(&:confirmation_required?) ||# Little hacky fix for #4117# If this wasn't here, order would transition to address state on confirm failure# because there would be no valid payments any more.diff --git a/core/app/models/spree/order/payments.rb b/core/app/models/spree/order/payments.rbindex 775d3442a7..ea37de1e1c 100644--- a/core/app/models/spree/order/payments.rb+++ b/core/app/models/spree/order/payments.rb@@ -20,7 +20,7 @@ module Spree# :allow_checkout_on_gateway_error is set to false#def process_payments!- process_payments_with(:process!)+ with_lock { process_payments_with(:process!) }enddef authorize_payments!diff --git a/core/app/models/spree/payment_method.rb b/core/app/models/spree/payment_method.rbindex eb94cca0c8..f7c743361c 100644--- a/core/app/models/spree/payment_method.rb+++ b/core/app/models/spree/payment_method.rb@@ -61,6 +61,10 @@ module Spreeunscoped { find(*args) }end+ def confirmation_required?+ false+ end+def payment_profiles_supported?falseenddiff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 79d4338d48..a90423cfb9 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -505,6 +505,8 @@ describe Spree::Order, type: :model doenddescribe '#confirmation_required?' do+ subject { order.confirmation_required? }+# Regression test for #4117it "is required if the state is currently 'confirm'" doorder = Spree::Order.new@@ -536,6 +538,26 @@ describe Spree::Order, type: :model doassert !order.confirmation_required?endend++ context 'when the payment does not require confirmation' do+ before do+ order.update_column(:total, 50)+ create(:payment, order: order, amount: 50)++ allow_any_instance_of(Spree::Gateway::Bogus).to receive(:confirmation_required?).and_return(false)+ end++ it { is_expected.to be(false) }+ end++ context 'when at least one payment method requires confirmation' do+ before do+ order.update_column(:total, 50)+ create(:payment, order: order, amount: 50)+ end++ it { is_expected.to be(true) }+ endendcontext 'add_update_hook' do