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

Adapt CheckoutController to new Spree changes

Browse Source 
Freely inspired by ad5551bf84
This commit is contained in:
enricostano
2017-04-06 14:23:01 +02:00
committed by Rob Harrington
parent a80d75e7e2
commit c439a23ef9
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/checkout_controller.rb
View File

@@ -26,9 +26,7 @@ class CheckoutController < Spree::CheckoutController
return if redirect_to_paypal_express_form_if_needed
end
if advance_order_state(@order)
state_callback(:after)
else
unless advance_order_state(@order)
if @order.errors.present?
flash[:error] = @order.errors.full_messages.to_sentence
else
@@ -154,7 +152,7 @@ class CheckoutController < Spree::CheckoutController
raise_insufficient_quantity and return if @order.insufficient_stock_lines.present?
redirect_to main_app.shop_path and return if @order.completed?
before_address
state_callback(:before)
setup_for_current_state
end
def before_address