raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove pointless callbacks in CheckoutController

Browse Source 
These exact same checks are already made in #load_order (and #order_invalid_for_checkout?), which is called before these other two (later) callbacks.
This commit is contained in:
Matt-Yorkley
2021-12-05 12:14:37 +00:00
parent 77d89ec7d0
commit 4d6c4f850f
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/checkout_controller.rb
View File

@@ -22,8 +22,6 @@ class CheckoutController < ::BaseController
before_action :load_order
before_action :ensure_order_not_completed
before_action :ensure_checkout_allowed
before_action :handle_insufficient_stock
before_action :associate_user
@@ -63,20 +61,12 @@ class CheckoutController < ::BaseController
authorize!(:edit, current_order, session[:access_token])
end
def ensure_checkout_allowed
redirect_to main_app.cart_path unless @order.checkout_allowed?
end
def ensure_order_not_completed
redirect_to main_app.cart_path if @order.completed?
end
def load_order
@order = current_order
if order_invalid_for_checkout?
Bugsnag.notify("Notice: invalid order loaded during Stripe processing", order: @order) if valid_payment_intent_provided?
redirect_to(main_app.shop_path) && return
return redirect_to(main_app.shop_path)
end
handle_invalid_stock && return unless valid_order_line_items?