diff --git a/app/controllers/admin/billing/prices_controller.rb b/app/controllers/admin/billing/prices_controller.rb
index 8b79d6eb5..a9862b113 100644
--- a/app/controllers/admin/billing/prices_controller.rb
+++ b/app/controllers/admin/billing/prices_controller.rb
@@ -8,11 +8,15 @@ module Admin
helper_method :durations
helper_method :statuses
+ def self.default_status
+ 'effective'
+ end
+
def index
@search = OpenStruct.new(search_params)
unless @search.status
- @search.status = default_status
+ @search.status = self.class.default_status
end
prices = ::Billing::Price.all
@@ -105,11 +109,7 @@ module Admin
end
def statuses
- ::Billing::Price.statuses
- end
-
- def default_status
- 'effective'
+ ::Billing::Price.statuses.map { |status| [status.capitalize, status] }
end
end
end
diff --git a/app/views/admin/billing/prices/_search_form.html.erb b/app/views/admin/billing/prices/_search_form.html.erb
index 27ba0ca05..070243de1 100644
--- a/app/views/admin/billing/prices/_search_form.html.erb
+++ b/app/views/admin/billing/prices/_search_form.html.erb
@@ -3,7 +3,7 @@
<%= f.label :status, class: 'col-sm-2 control-label' %>
- <%= f.select :status, options_for_select(statuses, search.status), { include_blank: true },
+ <%= f.select :status, options_for_select(statuses, search.status), { include_blank: t('.any') },
class: 'form-control' %>
diff --git a/config/locales/admin/billing/prices.en.yml b/config/locales/admin/billing/prices.en.yml
index 12f16f3f3..17898e6b7 100644
--- a/config/locales/admin/billing/prices.en.yml
+++ b/config/locales/admin/billing/prices.en.yml
@@ -29,5 +29,6 @@ en:
update_btn: Update price
search_form:
+ any: Any
search_btn: Search
reset_btn: Reset
diff --git a/spec/features/admin/billing/prices/list_spec.rb b/spec/features/admin/billing/prices/list_spec.rb
index d6551f8ac..95ebcb975 100644
--- a/spec/features/admin/billing/prices/list_spec.rb
+++ b/spec/features/admin/billing/prices/list_spec.rb
@@ -19,7 +19,7 @@ RSpec.feature 'Viewing prices in admin area', settings: false do
context 'when status is given' do
scenario 'filters by given status' do
visit admin_prices_path
- select 'effective', from: 'search_status'
+ select Admin::Billing::PricesController.default_status.capitalize, from: 'search_status'
submit_search_form
expect(page).to have_css('.price', count: 1)