From ad19805ee4705fd85ba567dfd213dcb02227cdf3 Mon Sep 17 00:00:00 2001 From: Jordan Brough Date: Wed, 21 Sep 2016 06:16:32 -0600 Subject: [PATCH 1/2] Remove deprecated code In the deprecation warning we said we'd remove this in Solidus 2.0. --- core/app/models/spree/promotion.rb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rb index 099da4c9535..c2cd8581b31 100644 --- a/core/app/models/spree/promotion.rb +++ b/core/app/models/spree/promotion.rb @@ -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) From ca30c1cdc54acd46ada46179ff03d4f339e2afda Mon Sep 17 00:00:00 2001 From: Jordan Brough Date: Wed, 21 Sep 2016 22:27:01 -0600 Subject: [PATCH 2/2] Add changelog entry for removal of `Promotion#expired?` --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c46a8ee581f..3ca95d4553f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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