Formatting changes

app/views/producer_mailer/order_cycle_report.html.haml

@@ -1,12 +1,15 @@
-%p Dear #{@producer.name},
+%p
+  = t :producer_mail_greeting
+  #{" " + @producer.name},
 %p
   = t :producer_mail_text_before
   - if @receival_instructions
     %p
-      Stock pickup/delivery instructions:
+      %b
+        =t :producer_mail_delivery_instructions
       = @receival_instructions
 %p
-  Here is a summary of the orders for your products:
+  = t :producer_mail_order_text
   %table.order-summary
     %thead
       %tr
@@ -40,7 +43,7 @@
           %td.text-right
             #{line_item.display_total}
           %td.text-right
-            #{line_item.display_included_tax}
+            #{line_item.display_included_tax_amount}
       %tr.total_row
         %td
         %td
@@ -57,6 +60,13 @@
     %p
       #{@coordinator.name}
     %p
-      #{@coordinator.address.address1}, #{@coordinator.address.city}, #{@coordinator.address.zipcode}
+      %br
+        #{@coordinator.address.address1}
+      %br
+        #{@coordinator.address.city}
+      %br
+        #{@coordinator.address.zipcode}
+    %p
       #{@coordinator.phone}
+    %p
       #{@coordinator.email}

config/locales/en.yml

@@ -410,7 +410,10 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   If you are a producer or food enterprise, we are excited to have you as a part of the network."
   email_signup_help_html: "We welcome all your questions and feedback; you can use the <em>Send Feedback</em> button on the site or email us at"
 
+  producer_mail_greeting: "Dear"
   producer_mail_text_before: "We now have all the consumer orders for the next food drop."
+  producer_mail_order_text: "Here is a summary of the orders for your products:"
+  producer_mail_delivery_instructions: "Stock pickup/delivery instructions:"
   producer_mail_text_after: "Thanks and best wishes,"
 
   shopping_oc_closed: Orders are closed

spec/mailers/producer_mailer_spec.rb

@@ -65,6 +65,7 @@ describe ProducerMailer do
   end
 
   it "includes the total" do
+    puts mail.body.encoded
     mail.body.encoded.should include 'Total: $30.00'
   end