diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index f35caf31f..219326f45 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -93,7 +93,11 @@ module FiltersHelper end def collection_year_options - { "2023": "2023/24", "2022": "2022/23", "2021": "2021/22" } + if FeatureToggle.collection_2024_2025_year_enabled? + { "2024": "2024/25", "2023": "2023/24", "2022": "2022/23" } + else + { "2023": "2023/24", "2022": "2022/23", "2021": "2021/22" } + end end def filters_applied_text(filter_type) @@ -174,4 +178,8 @@ private end end end + + def year_combo(year) + "#{year}/#{year - 2000 + 1}" + end end diff --git a/app/services/feature_toggle.rb b/app/services/feature_toggle.rb index 38c1372e1..9566dccb0 100644 --- a/app/services/feature_toggle.rb +++ b/app/services/feature_toggle.rb @@ -1,4 +1,8 @@ class FeatureToggle + def self.collection_2024_2025_year_enabled? + !Rails.env.production? + end + # Disable check on preview apps to allow for testing of future forms def self.saledate_collection_window_validation_enabled? Rails.env.production? || Rails.env.test? || Rails.env.staging?