From 41bb5e4e96fce6c193a581ab2be9c1c32e3a7a3f Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 27 Apr 2018 18:06:26 +1000 Subject: [PATCH] Unify report rendering --- .../admin/reports_controller_decorator.rb | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 2a1f64989d..088d81281a 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -134,33 +134,16 @@ Spree::Admin::ReportsController.class_eval do end @report = OpenFoodNetwork::OrderAndDistributorReport.new orders - unless params[:csv] - render :html => @report - else - csv_string = CSV.generate do |csv| - csv << @report.header - @report.table.each { |row| csv << row } - end - send_data csv_string, :filename => "orders_and_distributors_#{timestamp}.csv" - end + csv_file_name = "orders_and_distributors_#{timestamp}.csv" + render_report(@report.header, @report.table, params[:csv], csv_file_name) end def sales_tax prepare_date_params params @distributors = Enterprise.is_distributor.managed_by(spree_current_user) @report_type = params[:report_type] - @report = OpenFoodNetwork::SalesTaxReport.new spree_current_user, params - - unless params[:csv] - render :html => @report - else - csv_string = CSV.generate do |csv| - csv << @report.header - @report.table.each { |row| csv << row } - end - send_data csv_string, :filename => "sales_tax.csv" - end + render_report(@report.header, @report.table, params[:csv], "sales_tax.csv") end def bulk_coop