<%= f.label t(:receipt_date_from) %>
<%= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from) %>
+
<%= f.label t(:receipt_date_until) %>
<%= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until) %>
@@ -48,12 +48,15 @@
-
+
+ <%= button_tag t('.download_btn'),
+ formaction: admin_account_activities_path(format: 'csv'),
+ class: 'btn btn-default' %>
<%= link_to(t('.reset_btn'), admin_account_activities_path, class: 'btn btn-default') %>
diff --git a/app/views/admin/account_activities/index.haml b/app/views/admin/account_activities/index.haml
index df84b2757..2e1d57dc6 100644
--- a/app/views/admin/account_activities/index.haml
+++ b/app/views/admin/account_activities/index.haml
@@ -1,6 +1,3 @@
-- content_for :actions do
- = link_to(t(:export_csv), url_for(params.merge(format: 'csv')), class: 'btn btn-default')
-
= render 'shared/title', name: t(:account_activities)
= render 'search_form'
diff --git a/config/locales/admin/account_activities.en.yml b/config/locales/admin/account_activities.en.yml
index 2006f2f36..e7cc80d65 100644
--- a/config/locales/admin/account_activities.en.yml
+++ b/config/locales/admin/account_activities.en.yml
@@ -2,4 +2,5 @@ en:
admin:
account_activities:
search_form:
+ download_btn: Download CSV
reset_btn: Reset