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.

Connect to writing database when doing order.next in the payments con… (#12364)

Damian Kaczmarczyk33d76ecb94d1
diff --git a/admin/app/controllers/spree/admin/payments_controller.rb b/admin/app/controllers/spree/admin/payments_controller.rb
index 4f01ebdeca..67a202c08e 100644
--- a/admin/app/controllers/spree/admin/payments_controller.rb
+++ b/admin/app/controllers/spree/admin/payments_controller.rb
@@ -4,11 +4,9 @@ module Spree
belongs_to 'spree/order', find_by: :number
before_action :load_data
+ before_action :proceed_order_state, only: :new
def new
- # 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.to_s == params[:payment_method_id].to_s } : @payment_methods.first
@payment = @order.payments.build(
@@ -87,6 +85,13 @@ module Spree
private
+ def proceed_order_state
+ # Move order to payment state in order to capture tax generated on shipments
+ if @order.can_go_to_state?('payment')
+ @order.next
+ end
+ end
+
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)