diff --git a/app/views/spree/admin/reports/_date_range_form.html.haml b/app/views/spree/admin/reports/_date_range_form.html.haml new file mode 100644 index 0000000000..4d76b95d9f --- /dev/null +++ b/app/views/spree/admin/reports/_date_range_form.html.haml @@ -0,0 +1,9 @@ +.row.date-range-filter + = label_tag nil, t(:date_range) + %br + = label_tag nil, t(:start), :class => 'inline' + = f.text_field :completed_at_gt, :class => 'datetimepicker datepicker-from' + %span.range-divider + %i.icon-arrow-right + = f.text_field :completed_at_lt, :class => 'datetimepicker datepicker-to' + = label_tag nil, t(:end), :class => 'inline' diff --git a/app/views/spree/admin/reports/bulk_coop.html.haml b/app/views/spree/admin/reports/bulk_coop.html.haml index c9178d89db..d80a449bb4 100644 --- a/app/views/spree/admin/reports/bulk_coop.html.haml +++ b/app/views/spree/admin/reports/bulk_coop.html.haml @@ -1,16 +1,6 @@ = form_for @search, :url => spree.bulk_coop_admin_reports_path do |f| - = label_tag nil, t(:date_range) - %br - .date-range-filter - .left.sub-field - = f.text_field :completed_at_gt, :class => 'datepicker' - %br - = label_tag nil, t(:start), :class => 'sub' - .right.sub-field - = f.text_field :completed_at_lt, :class => 'datepicker' - %br - = label_tag nil, t(:stop) - %br + = render 'date_range_form', f: f + .row .four.columns.alpha = label_tag nil, "Distributor: " diff --git a/app/views/spree/admin/reports/orders_and_distributors.html.haml b/app/views/spree/admin/reports/orders_and_distributors.html.haml index 05e07243b3..23baad395e 100644 --- a/app/views/spree/admin/reports/orders_and_distributors.html.haml +++ b/app/views/spree/admin/reports/orders_and_distributors.html.haml @@ -1,19 +1,11 @@ -= form_for @search, :url => spree.orders_and_distributors_admin_reports_path do |s| - = label_tag nil, t(:date_range) - %br - .date-range-filter - .left.sub-field - = s.text_field :completed_at_gt, :class => 'datepicker' - %br - = label_tag nil, t(:start), :class => 'sub' - .right.sub-field - = s.text_field :completed_at_lt, :class => 'datepicker' - %br - = label_tag nil, t(:stop) += form_for @search, :url => spree.orders_and_distributors_admin_reports_path do |f| + = render 'date_range_form', f: f + = check_box_tag :csv = label_tag :csv, "Download as csv" %br = button t(:search) + %br %br %table#listing_orders.index diff --git a/app/views/spree/admin/reports/orders_and_fulfillment.html.haml b/app/views/spree/admin/reports/orders_and_fulfillment.html.haml index 522fdfdf39..081cb43384 100644 --- a/app/views/spree/admin/reports/orders_and_fulfillment.html.haml +++ b/app/views/spree/admin/reports/orders_and_fulfillment.html.haml @@ -1,13 +1,5 @@ = form_for @search, :url => spree.orders_and_fulfillment_admin_reports_path do |f| - .row.date-range-filter - = label_tag nil, t(:date_range) - %br - = label_tag nil, t(:start), :class => 'inline' - = f.text_field :completed_at_gt, :class => 'datetimepicker datepicker-from' - %span.range-divider - %i.icon-arrow-right - = f.text_field :completed_at_lt, :class => 'datetimepicker datepicker-to' - = label_tag nil, t(:end), :class => 'inline' + = render 'date_range_form', f: f .row .alpha.two.columns= label_tag nil, "Hubs: " diff --git a/app/views/spree/admin/reports/payments.html.haml b/app/views/spree/admin/reports/payments.html.haml index 26c523e87a..1a92d507db 100644 --- a/app/views/spree/admin/reports/payments.html.haml +++ b/app/views/spree/admin/reports/payments.html.haml @@ -1,16 +1,6 @@ = form_for @search, :url => spree.payments_admin_reports_path do |f| - = label_tag nil, t(:date_range) - %br - .date-range-filter - .left.sub-field - = f.text_field :completed_at_gt, :class => 'datepicker' - %br - = label_tag nil, t(:start), :class => 'sub' - .right.sub-field - = f.text_field :completed_at_lt, :class => 'datepicker' - %br - = label_tag nil, t(:stop) - %br + = render 'date_range_form', f: f + .row .four.columns.alpha = label_tag nil, "Distributor: "