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.

Fix payment method selection when adding new payment to order (#12362)

Damian Kaczmarczykaa0fb0ad6274
diff --git a/admin/app/controllers/spree/admin/payments_controller.rb b/admin/app/controllers/spree/admin/payments_controller.rb
index d1c3f17bf4..4f01ebdeca 100644
--- a/admin/app/controllers/spree/admin/payments_controller.rb
+++ b/admin/app/controllers/spree/admin/payments_controller.rb
@@ -9,7 +9,7 @@ module Spree
# Move order to payment state in order to capture tax generated on shipments
@order.next if @order.can_go_to_state?('payment')
- payment_method = params[:payment_method_id] ? @payment_methods.find { |pm| pm.id == params[:payment_method_id] } : @payment_methods.first
+ payment_method = params[:payment_method_id] ? @payment_methods.find { |pm| pm.id.to_s == params[:payment_method_id].to_s } : @payment_methods.first
@payment = @order.payments.build(
amount: @order.total_minus_store_credits - @order.payment_total,
@@ -87,6 +87,11 @@ module Spree
private
+ def build_resource
+ # This method is overridden because we don't want order to have invalid payment since we are doing `order.next` in the `new` action
+ model_class.new(order: parent)
+ end
+
def model_class
Spree::Payment
end
diff --git a/admin/spec/controllers/spree/admin/payments_controller_spec.rb b/admin/spec/controllers/spree/admin/payments_controller_spec.rb
index ec72123443..b9c619e1ef 100644
--- a/admin/spec/controllers/spree/admin/payments_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/payments_controller_spec.rb
@@ -63,6 +63,68 @@ RSpec.describe Spree::Admin::PaymentsController, type: :controller do
end
end
+ describe 'GET #new' do
+ subject { get :new, params: params }
+ let(:params) { { order_id: order.number } }
+
+ context 'when order can transition to payment state' do
+ let(:order) { create(:order_ready_to_ship, state: 'delivery') }
+
+ it 'transitions order to payment state' do
+ expect(order.state).to eq('delivery')
+ subject
+ expect(order.reload.state).to eq('payment')
+ end
+ end
+
+ context 'when specific payment method is requested' do
+ let(:specific_payment_method) { create(:credit_card_payment_method, display_on: 'back_end') }
+ let(:params) { { order_id: order.number, payment_method_id: specific_payment_method.id } }
+
+ before do
+ create(:credit_card_payment_method, display_on: 'back_end')
+ end
+
+ it 'assigns the requested payment method' do
+ subject
+ expect(assigns(:payment).payment_method).to eq(specific_payment_method)
+ end
+ end
+
+ context 'when no specific payment method is requested' do
+ let!(:first_payment_method) { create(:credit_card_payment_method, display_on: 'back_end') }
+
+ before do
+ create(:credit_card_payment_method, display_on: 'back_end')
+ end
+
+ it 'assigns the first available payment method' do
+ subject
+ expect(assigns(:payment).payment_method).to eq(first_payment_method)
+ end
+ end
+
+ context 'when payment method requires source' do
+ let(:payment_method) { create(:credit_card_payment_method, display_on: 'back_end') }
+ let(:params) { { order_id: order.number, payment_method_id: payment_method.id } }
+
+ it 'builds a new source' do
+ subject
+ expect(assigns(:payment).source).to be_a_new(Spree::CreditCard)
+ end
+ end
+
+ context 'when payment method does not require source' do
+ let(:payment_method) { create(:check_payment_method, display_on: 'back_end') }
+ let(:params) { { order_id: order.number, payment_method_id: payment_method.id } }
+
+ it 'does not build a source' do
+ subject
+ expect(assigns(:payment).source).to be_nil
+ end
+ end
+ end
+
describe 'POST #create' do
subject { post :create, params: params }