From 58e9cd3eeb0d54b98d48259ac7926ffa9d33f1fb Mon Sep 17 00:00:00 2001 From: Andrew Spinks Date: Sun, 15 Jul 2012 21:00:10 +1000 Subject: [PATCH] fix distributor name in report --- app/controllers/spree/admin/reports_controller_decorator.rb | 3 +-- app/views/spree/admin/reports/orders.html.haml | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index d63a410ed3..dbe3082f1f 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -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 diff --git a/app/views/spree/admin/reports/orders.html.haml b/app/views/spree/admin/reports/orders.html.haml index 15ec2c192a..a7e596d83f 100644 --- a/app/views/spree/admin/reports/orders.html.haml +++ b/app/views/spree/admin/reports/orders.html.haml @@ -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)