From 06569ea24c94d4abdb58a89148e11c1ed9649d4e Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 4 Feb 2020 13:10:51 +0000 Subject: [PATCH] Refactor load_order to fix rubocop issues --- app/controllers/checkout_controller.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb index 4e2c1d5e60..338ed74865 100644 --- a/app/controllers/checkout_controller.rb +++ b/app/controllers/checkout_controller.rb @@ -224,13 +224,19 @@ class CheckoutController < Spree::StoreController def load_order @order = current_order - redirect_to(main_app.shop_path) && return unless @order && @order.checkout_allowed? + + redirect_to(main_app.shop_path) && return if redirect_to_shop? redirect_to_cart_path && return unless valid_order_line_items? - redirect_to(main_app.shop_path) && return if @order.completed? before_address setup_for_current_state end + def redirect_to_shop? + !@order || + !@order.checkout_allowed? || + @order.completed? + end + def setup_for_current_state method_name = :"before_#{@order.state}" __send__(method_name) if respond_to?(method_name, true)