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

Fix deprecation warning for Spree::Shipment#reverse_chronological scope #2921

Merged
merged 2 commits into from
Nov 22, 2018
Merged

Fix deprecation warning for Spree::Shipment#reverse_chronological scope #2921

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91cba8d
Fix deprecation warning for Spree::Shipment#reverse_chronological scope
aitbw Oct 19, 2018
dc248d8
Use Spree::Shipment.table_name to avoid hardcoded values
aitbw Oct 22, 2018
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
5 changes: 4 additions & 1 deletion core/app/models/spree/shipment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ class Shipment < Spree::Base
scope :trackable, -> { where("tracking IS NOT NULL AND tracking != ''") }
scope :with_state, ->(*s) { where(state: s) }
# sort by most recent shipped_at, falling back to created_at. add "id desc" to make specs that involve this scope more deterministic.
scope :reverse_chronological, -> { order('coalesce(spree_shipments.shipped_at, spree_shipments.created_at) desc', id: :desc) }
scope :reverse_chronological, -> {
order(Arel.sql('coalesce(spree_shipments.shipped_at, spree_shipments.created_at) desc'), id: :desc)
aitbw marked this conversation as resolved.
Show resolved Hide resolved
}

scope :by_store, ->(store) { joins(:order).merge(Spree::Order.by_store(store)) }

# shipment state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
Expand Down