From e897eb043909d3280c585cfcac450bd8ac0d2234 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 8 Jul 2019 13:33:35 +0100 Subject: [PATCH] Remove Spree::BaseController.class_eval, these methods are already in the application helper through spree::application_helpers We can ignore the difference in spree_logout_path as spree.logout_path is the user_sessions#destroy route --- .../spree/base_controller_decorator.rb | 18 ------------------ .../core/controller_helpers/order_decorator.rb | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 app/controllers/spree/base_controller_decorator.rb diff --git a/app/controllers/spree/base_controller_decorator.rb b/app/controllers/spree/base_controller_decorator.rb deleted file mode 100644 index f907c70105..0000000000 --- a/app/controllers/spree/base_controller_decorator.rb +++ /dev/null @@ -1,18 +0,0 @@ -Spree::BaseController.class_eval do - def spree_login_path - spree.login_path - end - - def spree_signup_path - spree.signup_path - end - - def spree_logout_path - spree.destroy_spree_user_session_path - end - - def spree_current_user - current_spree_user - end -end - diff --git a/lib/spree/core/controller_helpers/order_decorator.rb b/lib/spree/core/controller_helpers/order_decorator.rb index cb644bb701..6da1b42ee6 100644 --- a/lib/spree/core/controller_helpers/order_decorator.rb +++ b/lib/spree/core/controller_helpers/order_decorator.rb @@ -15,7 +15,7 @@ Spree::Core::ControllerHelpers::Order.class_eval do end alias_method_chain :current_order, :scoped_variants - # Override definition in spree/auth/app/controllers/spree/base_controller_decorator.rb + # Override definition in Spree::Core::ControllerHelpers::Order # Do not attempt to merge incomplete and current orders. Instead, destroy the incomplete orders. def set_current_order if user = try_spree_current_user