raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix distributor name in report

Browse Source
This commit is contained in:
Andrew Spinks
2012-07-15 21:00:10 +10:00
parent 54559c4a5f
commit 58e9cd3eeb
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,12 +26,11 @@ Spree::Admin::ReportsController.class_eval do
else
csv_string = CSV.generate do |csv|
csv << ["Order date", "Order Id", "Name","Email", "SKU", "Item cost", "Quantity", "Cost", "Shipping cost", "Distributor", "Distributor address", "Distributor city", "Distributor postcode"]
puts @orders
@orders.each do |order|
order.line_items.each do |line_item|
csv << [order.created_at, order.id, order.bill_address.full_name, order.user.email,
line_item.product.sku, line_item.product.name, line_item.quantity, line_item.price * line_item.quantity, line_item.itemwise_shipping_cost,
order.distributor.pickup_address.full_name, order.distributor.pickup_address.address1, order.distributor.pickup_address.city, order.distributor.pickup_address.zipcode ]
order.distributor.name, order.distributor.pickup_address.address1, order.distributor.pickup_address.city, order.distributor.pickup_address.zipcode ]
end
end
end

4
app/views/spree/admin/reports/orders.html.haml
View File

@@ -28,7 +28,7 @@
%td= line_item.quantity
%td= line_item.price * line_item.quantity
%td= line_item.itemwise_shipping_cost
%td= order.distributor.pickup_address.full_name
%td= order.distributor.name
%td= order.distributor.pickup_address.address1
%td= order.distributor.pickup_address.city
%td= order.distributor.pickup_address.zipcode
@@ -36,8 +36,6 @@
%tr
%td{:colspan => "2"}= t(:none)
- content_for :sidebar do
= form_for @search, :url => spree.orders_admin_reports_path do |s|
= label_tag nil, t(:date_range)