Fix current user method for Spree 1.2.x
This commit is contained in:
parent
369ee290de
commit
56930b93aa
|
@ -337,7 +337,7 @@ module Spree
|
||||||
end
|
end
|
||||||
|
|
||||||
# suggest current user's email or any email stored in the order
|
# suggest current user's email or any email stored in the order
|
||||||
opts[:email] = current_user ? current_user.email : order.email
|
opts[:email] = spree_current_user ? spree_current_user.email : order.email
|
||||||
|
|
||||||
opts
|
opts
|
||||||
end
|
end
|
||||||
|
|
|
@ -22,7 +22,7 @@ module Spree
|
||||||
|
|
||||||
before do
|
before do
|
||||||
Spree::Auth::Config.set(:registration_step => false)
|
Spree::Auth::Config.set(:registration_step => false)
|
||||||
controller.stub(:current_order => order, :check_authorization => true, :current_user => order.user)
|
controller.stub(:current_order => order, :check_authorization => true, :spree_current_user => order.user)
|
||||||
order.stub(:checkout_allowed? => true, :completed? => false)
|
order.stub(:checkout_allowed? => true, :completed? => false)
|
||||||
order.update!
|
order.update!
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue