Skip to content

armgit / spree

Public Imported from GitHub
0

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.

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.rb
index eca35e8e5d..490b328ba2 100644
--- a/core/app/models/spree/gateway/bogus.rb
+++ b/core/app/models/spree/gateway/bogus.rb
@@ -72,6 +72,10 @@ module Spree
true
end
+ def confirmation_required?
+ true
+ end
+
def payment_profiles_supported?
true
end
diff --git a/core/app/models/spree/gateway/custom_payment_source_method.rb b/core/app/models/spree/gateway/custom_payment_source_method.rb
index 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 Spree
Spree::PaymentSource
end
+ def confirmation_required?
+ true
+ end
+
def payment_profiles_supported?
true
end
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 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 process
def 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.rb
index 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!) }
end
def authorize_payments!
diff --git a/core/app/models/spree/payment_method.rb b/core/app/models/spree/payment_method.rb
index eb94cca0c8..f7c743361c 100644
--- a/core/app/models/spree/payment_method.rb
+++ b/core/app/models/spree/payment_method.rb
@@ -61,6 +61,10 @@ module Spree
unscoped { find(*args) }
end
+ def confirmation_required?
+ false
+ end
+
def payment_profiles_supported?
false
end
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index 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 do
end
describe '#confirmation_required?' do
+ subject { order.confirmation_required? }
+
# Regression test for #4117
it "is required if the state is currently 'confirm'" do
order = Spree::Order.new
@@ -536,6 +538,26 @@ describe Spree::Order, type: :model do
assert !order.confirmation_required?
end
end
+
+ 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) }
+ end
end
context 'add_update_hook' do