mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-25 20:46:48 +00:00
Extract and standardise use of #order_completion_route
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user