From 9a5ee81431d7a16219250277aef239d6973c1ff5 Mon Sep 17 00:00:00 2001 From: Lynne Davis Date: Tue, 11 Nov 2014 17:49:08 +0000 Subject: [PATCH 1/2] Changing report download titles in include download date --- .../spree/admin/reports_controller_decorator.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 22dd41549f..8dfd5e0708 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -50,7 +50,7 @@ Spree::Admin::ReportsController.class_eval do @report_type = params[:report_type] @report = OpenFoodNetwork::CustomersReport.new spree_current_user, params - render_report(@report.header, @report.table, params[:csv], "customers.csv") + render_report(@report.header, @report.table, params[:csv], "customers_"+Time.now.strftime("%Y%m%d")+".csv") end def orders_and_distributors @@ -78,7 +78,7 @@ Spree::Admin::ReportsController.class_eval do csv << @report.header @report.table.each { |row| csv << row } end - send_data csv_string, :filename => "orders_and_distributors.csv" + send_data csv_string, :filename => "orders_and_distributors_"+Time.now.strftime("%Y%m%d")+".csv" end end @@ -230,7 +230,7 @@ Spree::Admin::ReportsController.class_eval do @header = header @table = order_grouper.table(@line_items) - csv_file_name = "bulk_coop.csv" + csv_file_name = "bulk_coop_"+Time.now.strftime("%Y%m%d")+".csv" render_report(@header, @table, params[:csv], csv_file_name) end @@ -334,7 +334,7 @@ Spree::Admin::ReportsController.class_eval do @header = header @table = order_grouper.table(table_items) - csv_file_name = "payments.csv" + csv_file_name = "payments_"+Time.now.strftime("%Y%m%d")+".csv" render_report(@header, @table, params[:csv], csv_file_name) @@ -564,7 +564,7 @@ Spree::Admin::ReportsController.class_eval do @header = header @table = order_grouper.table(table_items) - csv_file_name = "#{__method__}.csv" + csv_file_name = params[:report_type]+"_"+Time.now.strftime("%Y%m%d")+".csv" render_report(@header, @table, params[:csv], csv_file_name) @@ -576,7 +576,7 @@ Spree::Admin::ReportsController.class_eval do @report = OpenFoodNetwork::ProductsAndInventoryReport.new spree_current_user, params #@table = @report.table #@header = @report.header - render_report(@report.header, @report.table, params[:csv], "products_and_inventory.csv") + render_report(@report.header, @report.table, params[:csv], "products_and_inventory_"+Time.now.strftime("%Y%m%d")+".csv") end def render_report (header, table, create_csv, csv_file_name) From cc3959467d0de38266b6b847ca4f7e01aedc8e9e Mon Sep 17 00:00:00 2001 From: Lynne Davis Date: Thu, 13 Nov 2014 10:30:00 +0000 Subject: [PATCH 2/2] 285: Report downlaod naming - Updating to the cleaner suggestions of Rohan. Note to self, don't be lazy :-) --- .../spree/admin/reports_controller_decorator.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 8dfd5e0708..ee4bff6939 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -50,7 +50,7 @@ Spree::Admin::ReportsController.class_eval do @report_type = params[:report_type] @report = OpenFoodNetwork::CustomersReport.new spree_current_user, params - render_report(@report.header, @report.table, params[:csv], "customers_"+Time.now.strftime("%Y%m%d")+".csv") + render_report(@report.header, @report.table, params[:csv], "customers_#{timestamp}.csv") end def orders_and_distributors @@ -78,7 +78,7 @@ Spree::Admin::ReportsController.class_eval do csv << @report.header @report.table.each { |row| csv << row } end - send_data csv_string, :filename => "orders_and_distributors_"+Time.now.strftime("%Y%m%d")+".csv" + send_data csv_string, :filename => "orders_and_distributors_#{timestamp}.csv" end end @@ -230,7 +230,7 @@ Spree::Admin::ReportsController.class_eval do @header = header @table = order_grouper.table(@line_items) - csv_file_name = "bulk_coop_"+Time.now.strftime("%Y%m%d")+".csv" + csv_file_name = "bulk_coop_#{timestamp}.csv" render_report(@header, @table, params[:csv], csv_file_name) end @@ -334,7 +334,7 @@ Spree::Admin::ReportsController.class_eval do @header = header @table = order_grouper.table(table_items) - csv_file_name = "payments_"+Time.now.strftime("%Y%m%d")+".csv" + csv_file_name = "payments_#{timestamp}.csv" render_report(@header, @table, params[:csv], csv_file_name) @@ -564,7 +564,7 @@ Spree::Admin::ReportsController.class_eval do @header = header @table = order_grouper.table(table_items) - csv_file_name = params[:report_type]+"_"+Time.now.strftime("%Y%m%d")+".csv" + csv_file_name = "#{params[:report_type]}_#{timestamp}.csv" render_report(@header, @table, params[:csv], csv_file_name) @@ -576,7 +576,7 @@ Spree::Admin::ReportsController.class_eval do @report = OpenFoodNetwork::ProductsAndInventoryReport.new spree_current_user, params #@table = @report.table #@header = @report.header - render_report(@report.header, @report.table, params[:csv], "products_and_inventory_"+Time.now.strftime("%Y%m%d")+".csv") + render_report(@report.header, @report.table, params[:csv], "products_and_inventory_#{timestamp}.csv") end def render_report (header, table, create_csv, csv_file_name) @@ -627,4 +627,8 @@ Spree::Admin::ReportsController.class_eval do end total_units.round(3) end + + def timestamp + Time.now.strftime("%Y%m%d") + end end