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

Extract checkout_workflow from checkout#update

Browse Source
This commit is contained in:
luisramos0
2020-02-04 10:57:03 +00:00
parent 5ce3e1e0d2
commit 9a0ee254af
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/controllers/checkout_controller.rb
View File

@@ -46,26 +46,7 @@ class CheckoutController < Spree::StoreController
fire_event('spree.checkout.update')
while @order.state != "complete"
if @order.state == "payment"
return if redirect_to_paypal_express_form_if_needed
end
if @order.state == "delivery"
@order.select_shipping_method(shipping_method_id)
end
next if advance_order_state(@order)
flash[:error] = if @order.errors.present?
@order.errors.full_messages.to_sentence
else
t(:payment_processing_failed)
end
update_failed
return
end
return update_failed unless @order.state == "complete" || @order.completed?
return unless checkout_workflow(shipping_method_id)
set_default_bill_address
set_default_ship_address
@@ -91,6 +72,35 @@ class CheckoutController < Spree::StoreController
update_failed
end
def checkout_workflow(shipping_method_id)
while @order.state != "complete"
if @order.state == "payment"
return false if redirect_to_paypal_express_form_if_needed
end
if @order.state == "delivery"
@order.select_shipping_method(shipping_method_id)
end
next if advance_order_state(@order)
flash[:error] = if @order.errors.present?
@order.errors.full_messages.to_sentence
else
t(:payment_processing_failed)
end
update_failed
return false
end
if @order.completed?
true
else
update_failed
false
end
end
# Clears the cached order. Required for #current_order to return a new order
# to serve as cart. See https://github.com/spree/spree/blob/1-3-stable/core/lib/spree/core/controller_helpers/order.rb#L14
# for details.