diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 861d6a2b16..aaba20d51d 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -59,7 +59,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_#{timestamp}.csv") end def order_cycle_management @@ -99,7 +99,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_#{timestamp}.csv" end end @@ -251,7 +251,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_#{timestamp}.csv" render_report(@header, @table, params[:csv], csv_file_name) end @@ -355,7 +355,7 @@ Spree::Admin::ReportsController.class_eval do @header = header @table = order_grouper.table(table_items) - csv_file_name = "payments.csv" + csv_file_name = "payments_#{timestamp}.csv" render_report(@header, @table, params[:csv], csv_file_name) @@ -587,7 +587,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]}_#{timestamp}.csv" render_report(@header, @table, params[:csv], csv_file_name) @@ -596,7 +596,7 @@ Spree::Admin::ReportsController.class_eval do def products_and_inventory @report_types = REPORT_TYPES[:products_and_inventory] @report = OpenFoodNetwork::ProductsAndInventoryReport.new spree_current_user, params - render_report(@report.header, @report.table, params[:csv], "products_and_inventory.csv") + render_report(@report.header, @report.table, params[:csv], "products_and_inventory_#{timestamp}.csv") end def users_and_enterprises @@ -655,4 +655,8 @@ Spree::Admin::ReportsController.class_eval do end total_units.round(3) end + + def timestamp + Time.now.strftime("%Y%m%d") + end end