From 9d6e5e9420e2f016e01c08e29a20b470ed6f46f4 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 1 Sep 2021 13:00:17 +0100
Subject: [PATCH] Remove currently unused code

---
 .../concerns/checkout_callbacks.rb            |  2 +-
 app/controllers/split_checkout_controller.rb  | 44 +------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/app/controllers/concerns/checkout_callbacks.rb b/app/controllers/concerns/checkout_callbacks.rb
index 3e3e360bd4..638389cd59 100644
--- a/app/controllers/concerns/checkout_callbacks.rb
+++ b/app/controllers/concerns/checkout_callbacks.rb
@@ -14,7 +14,7 @@ module CheckoutCallbacks
     prepend_before_action :require_distributor_chosen
 
     before_action :load_order, :associate_user, :load_saved_addresses
-    before_action :load_shipping_methods, :load_countries, if: -> { checkout_step == "details"}
+    before_action :load_shipping_methods, :load_countries, if: -> { params[:step] == "details"}
 
     before_action :ensure_order_not_completed
     before_action :ensure_checkout_allowed
diff --git a/app/controllers/split_checkout_controller.rb b/app/controllers/split_checkout_controller.rb
index f11c432aee..7467a8efcc 100644
--- a/app/controllers/split_checkout_controller.rb
+++ b/app/controllers/split_checkout_controller.rb
@@ -15,18 +15,9 @@ class SplitCheckoutController < ::BaseController
   helper OrderHelper
 
   def edit
-    return handle_redirect_from_stripe if valid_payment_intent_provided?
-
-    redirect_to_step unless checkout_step
+    redirect_to_step unless params[:step]
 
     OrderWorkflow.new(@order).next if @order.cart?
-
-    # This is only required because of spree_paypal_express. If we implement
-    # a version of paypal that uses this controller, and more specifically
-    # the #action_failed method, then we can remove this call
-    # OrderCheckoutRestart.new(@order).call
-  rescue Spree::Core::GatewayError => e
-    rescue_from_spree_gateway_error(e)
   end
 
   def update
@@ -64,10 +55,6 @@ class SplitCheckoutController < ::BaseController
     OrderWorkflow.new(@order).advance_checkout(raw_params.slice(:shipping_method_id))
   end
 
-  def checkout_step
-    @checkout_step ||= params[:step]
-  end
-
   def validate_terms_and_conditions!
     return true if params[:accept_terms]
 
@@ -91,33 +78,4 @@ class SplitCheckoutController < ::BaseController
       redirect_to order_path(@order)
     end
   end
-
-  def valid_payment_intent_provided?
-    return false unless params["payment_intent"]&.starts_with?("pi_")
-
-    last_payment = OrderPaymentFinder.new(@order).last_payment
-    @order.state == "payment" &&
-      last_payment&.state == "requires_authorization" &&
-      last_payment&.response_code == params["payment_intent"]
-  end
-
-  def handle_redirect_from_stripe
-    return checkout_failed unless @order.process_payments!
-
-    if OrderWorkflow.new(@order).next && order_complete?
-      checkout_succeeded
-      redirect_to(order_path(@order)) && return
-    else
-      checkout_failed
-    end
-  end
-
-  def order_complete?
-    @order.state == "complete" || @order.completed?
-  end
-
-  def rescue_from_spree_gateway_error(error)
-    flash[:error] = t(:spree_gateway_error_flash_for_checkout, error: error.message)
-    action_failed(error)
-  end
 end