raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

285: Report downlaod naming - Updating to the cleaner suggestions of Rohan. Note to self, don't be lazy :-)

Browse Source
This commit is contained in:
Lynne Davis
2014-11-13 10:30:00 +00:00
parent 9a5ee81431
commit cc3959467d
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/spree/admin/reports_controller_decorator.rb
View File

@@ -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