raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-30 06:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patching up our checkout flow so we don't try to create shipments before we have valid shipping addresses

Browse Source
This commit is contained in:
Will Marshall
2014-02-28 13:41:02 +11:00
parent 86a8b926f3
commit 1d5addb06e
4 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/controllers/shop/checkout_controller.rb
View File

@@ -11,31 +11,27 @@ class Shop::CheckoutController < Spree::CheckoutController
end
def update
begin
if @order.update_attributes(params[:order])
fire_event('spree.checkout.update')
if @order.update_attributes(params[:order])
fire_event('spree.checkout.update')
while @order.state != "complete"
if @order.next
state_callback(:after)
else
flash[:error] = t(:payment_processing_failed)
respond_with @order, location: main_app.shop_checkout_path
return
end
end
if @order.state == "complete" || @order.completed?
flash.notice = t(:order_processed_successfully)
flash[:commerce_tracking] = "nothing special"
respond_with(@order, :location => order_path(@order))
while @order.state != "complete"
if @order.next
state_callback(:after)
else
flash[:error] = t(:payment_processing_failed)
respond_with @order, location: main_app.shop_checkout_path
return
end
end
if @order.state == "complete" || @order.completed?
flash.notice = t(:order_processed_successfully)
flash[:commerce_tracking] = "nothing special"
respond_with(@order, :location => order_path(@order))
else
respond_with @order, location: main_app.shop_checkout_path
end
rescue ActiveRecord::RecordInvalid
else
respond_with @order, location: main_app.shop_checkout_path
end
end

20
app/models/spree/order_decorator.rb
View File

@@ -14,6 +14,26 @@ Spree::Order.class_eval do
before_validation :shipping_address_from_distributor
checkout_flow do
go_to_state :address
go_to_state :delivery
go_to_state :payment, :if => lambda { |order|
if order.ship_address.andand.valid?
# Fix for #2191
if order.shipping_method
order.create_shipment!
order.update_totals
end
order.payment_required?
else
false
end
}
go_to_state :confirm, :if => lambda { |order| order.confirmation_required? }
go_to_state :complete, :if => lambda { |order| (order.payment_required? && order.has_unprocessed_payments?) || !order.payment_required? }
remove_transition :from => :delivery, :to => :confirm
end
# -- Scopes
scope :managed_by, lambda { |user|