From 6385d9a782f8c2ba24e0a199eccdf3a2ddac8e6f Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sun, 5 Dec 2021 22:53:54 +0000
Subject: [PATCH] Simplify interface of #order_completion_route

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

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index fab3105adc..b2d45ddfac 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -128,7 +128,7 @@ class CheckoutController < ::BaseController
 
     if OrderWorkflow.new(@order).next && order_complete?
       processing_succeeded
-      redirect_to order_completion_route(@order)
+      redirect_to order_completion_route
     else
       processing_failed
     end
@@ -181,10 +181,10 @@ class CheckoutController < ::BaseController
   def update_succeeded_response
     respond_to do |format|
       format.html do
-        respond_with(@order, location: order_completion_route(@order))
+        respond_with(@order, location: order_completion_route)
       end
       format.json do
-        render json: { path: order_completion_route(@order) }, status: :ok
+        render json: { path: order_completion_route }, status: :ok
       end
     end
   end
diff --git a/app/controllers/concerns/order_completion.rb b/app/controllers/concerns/order_completion.rb
index 434bd49bc8..5c9e418b4e 100644
--- a/app/controllers/concerns/order_completion.rb
+++ b/app/controllers/concerns/order_completion.rb
@@ -31,8 +31,8 @@ module OrderCompletion
     new_order.tokenized_permission.save!
   end
 
-  def order_completion_route(order)
-    main_app.order_path(order, order_token: order.token)
+  def order_completion_route
+    main_app.order_path(@order, order_token: @order.token)
   end
 
   def order_invalid_for_checkout?
diff --git a/app/controllers/payment_gateways/paypal_controller.rb b/app/controllers/payment_gateways/paypal_controller.rb
index 9b5258a31b..0f9ba5ea06 100644
--- a/app/controllers/payment_gateways/paypal_controller.rb
+++ b/app/controllers/payment_gateways/paypal_controller.rb
@@ -54,7 +54,7 @@ module PaymentGateways
 
       if @order.complete?
         processing_succeeded
-        redirect_to order_completion_route(@order)
+        redirect_to order_completion_route
       else
         processing_failed
         redirect_to main_app.checkout_state_path(@order.state)