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.

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

Remove deprecated code #1461

Merged
merged 2 commits into from
Sep 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
* Analytics trackers were removed from the admin panel; the extension
`solidus_trackers` provides the same functionality

* Removals

* Removed deprecated method `Promotion#expired?` in favor of
`Promotion#inactive?`

## Solidus 2.0.0 (unreleased)

* Upgrade to rails 5.0
Expand Down
9 changes: 0 additions & 9 deletions core/app/models/spree/promotion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,6 @@ def inactive?
!active?
end

def expired?
Spree::Deprecation.warn <<-WARN.squish, caller
#expired? is deprecated, and will be removed in Solidus 2.0.
Please use #inactive? instead.
WARN

inactive?
end

def activate(order:, line_item: nil, user: nil, path: nil, promotion_code: nil)
return unless self.class.order_activatable?(order)

Expand Down