From c56486d7aeaee822adc93f1f6d43be282a178a89 Mon Sep 17 00:00:00 2001
From: luisramos0 <luisramos0@gmail.com>
Date: Thu, 4 Apr 2019 21:46:40 +0100
Subject: [PATCH] Remove unnecessary methods from spree checkoutcontroller

---
 app/controllers/spree/checkout_controller.rb | 58 +++++++-------------
 config/routes/spree.rb                       |  4 --
 2 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/app/controllers/spree/checkout_controller.rb b/app/controllers/spree/checkout_controller.rb
index b802650673..3a07a62ef5 100644
--- a/app/controllers/spree/checkout_controller.rb
+++ b/app/controllers/spree/checkout_controller.rb
@@ -3,11 +3,6 @@ require 'open_food_network/address_finder'
 class Spree::CheckoutController < Spree::StoreController
   include CheckoutHelper
 
-  before_filter :enable_embedded_shopfront
-
-  ####################################
-  #### Copied from Spree Frontend ####
-  ####################################
   ssl_required
 
   before_filter :load_order
@@ -18,12 +13,11 @@ class Spree::CheckoutController < Spree::StoreController
 
   before_filter :associate_user
   before_filter :check_authorization
+  before_filter :enable_embedded_shopfront
 
   helper 'spree/orders'
 
   rescue_from Spree::Core::GatewayError, :with => :rescue_from_spree_gateway_error
-  ####################################
-  ####################################
 
   def edit
     flash.keep
@@ -32,9 +26,6 @@ class Spree::CheckoutController < Spree::StoreController
 
   private
 
-  ####################################
-  #### Copied from Spree Frontend ####
-  ####################################
   def load_order
     @order = current_order
     redirect_to spree.cart_path and return unless @order
@@ -63,38 +54,11 @@ class Spree::CheckoutController < Spree::StoreController
     end
   end
 
-  # Provides a route to redirect after order completion
-  def completion_route
-    spree.order_path(@order)
-  end
-
   def setup_for_current_state
     method_name = :"before_#{@order.state}"
     send(method_name) if respond_to?(method_name, true)
   end
 
-  def before_delivery
-    return if params[:order].present?
-
-    packages = @order.shipments.map { |s| s.to_package }
-    @differentiator = Spree::Stock::Differentiator.new(@order, packages)
-  end
-
-  def rescue_from_spree_gateway_error
-    flash[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
-    render :edit
-  end
-
-  def check_authorization
-    authorize!(:edit, current_order, session[:access_token])
-  end
-  ####################################
-  ####################################
-
-  def before_payment
-    current_order.payments.destroy_all if request.put?
-  end
-
   # Adapted from spree_last_address gem: https://github.com/TylerRick/spree_last_address
   # Originally, we used a forked version of this gem, but encountered strange errors where
   # it worked in dev but only intermittently in staging/prod.
@@ -106,4 +70,24 @@ class Spree::CheckoutController < Spree::StoreController
     @order.bill_address = finder.bill_address
     @order.ship_address = finder.ship_address
   end
+
+  def before_delivery
+    return if params[:order].present?
+
+    packages = @order.shipments.map { |s| s.to_package }
+    @differentiator = Spree::Stock::Differentiator.new(@order, packages)
+  end
+
+  def before_payment
+    current_order.payments.destroy_all if request.put?
+  end
+
+  def rescue_from_spree_gateway_error
+    flash[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
+    render :edit
+  end
+
+  def check_authorization
+    authorize!(:edit, current_order, session[:access_token])
+  end
 end
diff --git a/config/routes/spree.rb b/config/routes/spree.rb
index f20e4a204a..b2ae4f4ef6 100644
--- a/config/routes/spree.rb
+++ b/config/routes/spree.rb
@@ -94,10 +94,6 @@ Spree::Core::Engine.routes.prepend do
   resources :states, :only => :index
   resources :countries, :only => :index
 
-  # non-restful checkout stuff
-  put '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
-  get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
-
   match '/orders/:id/token/:token' => 'orders#show', :via => :get, :as => :token_order
 
   # route globbing for pretty nested taxon and product paths