From f6ecf5773749ccebb356ddf43fb99e280104af58 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 14 Dec 2019 12:28:32 +0000 Subject: [PATCH] Make before filters easier to understand using the fact that there are only index, create, new and fire actions in this controller --- app/controllers/spree/admin/payments_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb index f195864d0e..a0476354bb 100644 --- a/app/controllers/spree/admin/payments_controller.rb +++ b/app/controllers/spree/admin/payments_controller.rb @@ -1,8 +1,7 @@ module Spree module Admin class PaymentsController < Spree::Admin::BaseController - before_filter :load_order, only: [:create, :new, :index, :fire] - before_filter :load_payment, except: [:create, :new, :index] + before_filter :load_order before_filter :load_data before_filter :can_transition_to_payment @@ -54,6 +53,8 @@ module Spree # When a user fires an event, take them back to where they came from # (we can't use respond_override because Spree no longer uses respond_with) def fire + load_payment + event = params[:e] return unless event && @payment.payment_source