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

Do not merge current and incomplete orders when logging in - fixes #20

Browse Source
This commit is contained in:
Rohan Mitchell
2013-08-14 10:44:02 +10:00
parent 8ff749d0eb
commit 5fac29d2ed
2 changed files with 23 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/spree/core/controller_helpers/order_decorator.rb
View File

@@ -1,22 +1,15 @@
Spree::Core::ControllerHelpers::Order.class_eval do
# Override definition in spree/auth/app/controllers/spree/base_controller_decorator.rb
# Do not attempt to merge incomplete and current orders when they have differing distributors
# Instead, destroy the incomplete orders, otherwise they are restored after checkout, causing much confusion
# Do not attempt to merge incomplete and current orders. Instead, destroy the incomplete orders.
def set_current_order
if user = try_spree_current_user
last_incomplete_order = user.last_incomplete_spree_order
if session[:order_id].nil? && last_incomplete_order
session[:order_id] = last_incomplete_order.id
elsif current_order && last_incomplete_order && current_order != last_incomplete_order
if (current_order.distributor.nil? || current_order.distributor == last_incomplete_order.distributor) &&
(current_order.order_cycle.nil? || current_order.order_cycle == last_incomplete_order.order_cycle)
current_order.set_distributor! last_incomplete_order.distributor if current_order.distributor.nil?
current_order.set_order_cycle! last_incomplete_order.order_cycle if current_order.order_cycle.nil?
current_order.merge!(last_incomplete_order)
else
last_incomplete_order.destroy
end
elsif current_order && last_incomplete_order && current_order != last_incomplete_order
last_incomplete_order.destroy
end
end
end