From 77d89ec7d076650f4e6bb4f0cf1c0bddf62e1bc0 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sun, 5 Dec 2021 11:50:18 +0000
Subject: [PATCH] Extract and standardise use of #order_completion_route

---
 app/controllers/checkout_controller.rb                | 6 +++---
 app/controllers/concerns/order_completion.rb          | 4 ++++
 app/controllers/payment_gateways/paypal_controller.rb | 6 +-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 960f73de45..cd73f8ddd0 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -154,7 +154,7 @@ class CheckoutController < ::BaseController
 
     if OrderWorkflow.new(@order).next && order_complete?
       checkout_succeeded
-      redirect_to order_path(@order)
+      redirect_to order_completion_route(@order)
     else
       checkout_failed
     end
@@ -221,10 +221,10 @@ class CheckoutController < ::BaseController
   def update_succeeded_response
     respond_to do |format|
       format.html do
-        respond_with(@order, location: order_path(@order))
+        respond_with(@order, location: order_completion_route(@order))
       end
       format.json do
-        render json: { path: order_path(@order) }, status: :ok
+        render json: { path: order_completion_route(@order) }, status: :ok
       end
     end
   end
diff --git a/app/controllers/concerns/order_completion.rb b/app/controllers/concerns/order_completion.rb
index d236adec42..966b8b394d 100644
--- a/app/controllers/concerns/order_completion.rb
+++ b/app/controllers/concerns/order_completion.rb
@@ -30,4 +30,8 @@ module OrderCompletion
     new_order.tokenized_permission.token = token
     new_order.tokenized_permission.save!
   end
+
+  def order_completion_route(order)
+    main_app.order_path(order, order_token: order.token)
+  end
 end
diff --git a/app/controllers/payment_gateways/paypal_controller.rb b/app/controllers/payment_gateways/paypal_controller.rb
index 0ed6b80cbf..a2e4f79bf0 100644
--- a/app/controllers/payment_gateways/paypal_controller.rb
+++ b/app/controllers/payment_gateways/paypal_controller.rb
@@ -56,7 +56,7 @@ module PaymentGateways
       @order.next
       if @order.complete?
         order_completion_reset(@order)
-        redirect_to completion_route(@order)
+        redirect_to order_completion_route(@order)
       else
         redirect_to main_app.checkout_state_path(@order.state)
       end
@@ -183,10 +183,6 @@ module PaymentGateways
       }
     end
 
-    def completion_route(order)
-      main_app.order_path(order, order_token: order.token)
-    end
-
     def address_required?
       payment_method.preferred_solution.eql?('Sole')
     end