Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use create_if_necessary instead of a simple find_or_initialize #3494

Merged
merged 7 commits into from
Mar 18, 2020
Merged

Use create_if_necessary instead of a simple find_or_initialize #3494

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df95ee0
Move a loose OrdersController spec to its spec file
elia Feb 3, 2020
4bfe9a7
Only pass the `lock` option to #find_order_by_token_or_user
elia Feb 3, 2020
aa5eaab
Avoid mutating the options hash passed order helpers
elia Feb 3, 2020
7c79a1c
Don't define top-level classes within specs
elia Feb 3, 2020
f40f627
Let Order#record_ip_address work with new records
elia Feb 3, 2020
d90be78
Let current_order accept a build_order_if_necessary option
elia Feb 3, 2020
030bf6c
Use current_order with build_if_necessary in cart page
elia Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Only pass the lock option to #find_order_by_token_or_user 
Restrict the number of options forwarded to
#find_order_by_token_or_user since the only one it uses is :lock.
  • Loading branch information
@elia
elia committed Feb 19, 2020
commit 4bfe9a7658fdc07e793d342032f3204995ea6655
2 changes: 1 addition & 1 deletion core/lib/spree/core/controller_helpers/order.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def current_order(options = {})

return @current_order if @current_order

@current_order = find_order_by_token_or_user(options)
@current_order = find_order_by_token_or_user(lock: options[:lock])

if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
@current_order = Spree::Order.new(new_order_params)
Expand Down