Merge pull request spree#7366 from tommiller1/associate-user-when-cre…

…ating-order Adds call to associate_user when creating a new order through frontend
kartikupadhyay90 · May 21, 2016 · 4afc2bb · 4afc2bb
2 parents 0484dbe + d98c3e7
commit 4afc2bb
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/core/lib/spree/core/controller_helpers/order.rb b/core/lib/spree/core/controller_helpers/order.rb
@@ -35,11 +35,8 @@ def current_order(options = {})
           @current_order = find_order_by_token_or_user(options, true)
 
           if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
-            @current_order = Spree::Order.new(current_order_params)
-            @current_order.user ||= try_spree_current_user
-            # See issue #3346 for reasons why this line is here
-            @current_order.created_by ||= try_spree_current_user
-            @current_order.save!
+            @current_order = Spree::Order.create!(current_order_params)
+            @current_order.associate_user! try_spree_current_user if try_spree_current_user
           end
 
           if @current_order