From 6e2684181728483ac8a03a87d6a09f0f791ac30c Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 14 Dec 2019 15:25:41 +0000 Subject: [PATCH] Fix load_order before filter and remove unused open and close adjustments actions --- .../spree/admin/orders_controller.rb | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb index 80a3b7f6f6..a6d8e250b7 100644 --- a/app/controllers/spree/admin/orders_controller.rb +++ b/app/controllers/spree/admin/orders_controller.rb @@ -9,10 +9,7 @@ module Spree before_filter :initialize_order_events before_filter :load_order, only: [:edit, :update, :fire, :resend, - :open_adjustments, :close_adjustments] - - before_filter :load_order, only: %i[show edit update fire resend invoice print print_ticket] - + :invoice, :print, :print_ticket] before_filter :load_distribution_choices, only: [:new, :edit, :update] # Ensure that the distributor is set for an order when @@ -110,22 +107,6 @@ module Spree @order.update_distribution_charge! end - def open_adjustments - adjustments = @order.adjustments.where(state: 'closed') - adjustments.update_all(state: 'open') - flash[:success] = Spree.t(:all_adjustments_opened) - - respond_with(@order) { |format| format.html { redirect_to :back } } - end - - def close_adjustments - adjustments = @order.adjustments.where(state: 'open') - adjustments.update_all(state: 'closed') - flash[:success] = Spree.t(:all_adjustments_closed) - - respond_with(@order) { |format| format.html { redirect_to :back } } - end - private def load_order