From 3dd7b296be70dbd34326df38ab53413693466897 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 23 Jul 2014 11:51:18 +1000
Subject: [PATCH] Show order notes (special instructions) on report and
 confirmation email

---
 .../spree/admin/reports_controller_decorator.rb           | 8 ++++++--
 app/views/spree/order_mailer/confirm_email.text.erb       | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb
index 62cfb585cd..377f1dbedf 100644
--- a/app/controllers/spree/admin/reports_controller_decorator.rb
+++ b/app/controllers/spree/admin/reports_controller_decorator.rb
@@ -475,7 +475,7 @@ Spree::Admin::ReportsController.class_eval do
       @include_blank = 'All'
 
       header = ["Hub", "Customer", "Email", "Phone", "Producer", "Product", "Variant", "Amount", "Item ($)", "Dist ($)", "Ship ($)", "Total ($)", "Paid?",
-                "Shipping", "Delivery?", "Ship street", "Ship street 2", "Ship city", "Ship postcode", "Ship state"]
+                "Shipping", "Delivery?", "Ship street", "Ship street 2", "Ship city", "Ship postcode", "Ship state", "Order notes"]
 
       rsa = proc { |line_items| line_items.first.order.shipping_method.andand.require_ship_address }
 
@@ -499,7 +499,9 @@ Spree::Admin::ReportsController.class_eval do
         proc { |line_items| line_items.first.order.ship_address.andand.address2 if rsa.call(line_items) },
         proc { |line_items| line_items.first.order.ship_address.andand.city if rsa.call(line_items) },
         proc { |line_items| line_items.first.order.ship_address.andand.zipcode if rsa.call(line_items) },
-        proc { |line_items| line_items.first.order.ship_address.andand.state if rsa.call(line_items) }]
+        proc { |line_items| line_items.first.order.ship_address.andand.state if rsa.call(line_items) },
+
+        proc { |line_items| line_items.first.order.special_instructions }]
 
     rules = [ { group_by: proc { |line_item| line_item.order.distributor },
       sort_by: proc { |distributor| distributor.name } },
@@ -525,6 +527,8 @@ Spree::Admin::ReportsController.class_eval do
         proc { |line_items| "" },
         proc { |line_items| "" },
         proc { |line_items| "" },
+        proc { |line_items| "" },
+
         proc { |line_items| "" } ] },
 
       { group_by: proc { |line_item| line_item.variant.product },
diff --git a/app/views/spree/order_mailer/confirm_email.text.erb b/app/views/spree/order_mailer/confirm_email.text.erb
index d5d07f0e90..a72ada83e2 100644
--- a/app/views/spree/order_mailer/confirm_email.text.erb
+++ b/app/views/spree/order_mailer/confirm_email.text.erb
@@ -54,6 +54,9 @@ Ready for collection: <%= @order.order_cycle.pickup_time_for(@order.distributor)
 Collection instructions: <%= @order.order_cycle.pickup_instructions_for(@order.distributor) %>
 
 <% end %>
+<% end %>
+<% if @order.special_instructions.present? %>Order notes: <%= @order.special_instructions %>
+
 <% end %>
 
 Thanks for your support.