From d043de08cd94b90b7b63bdb5fcb2f42fcd0fe450 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 20 May 2016 09:42:19 +1000 Subject: [PATCH] Revert "Temporarily comment out tax column" This reverts commit 858beb97c5ae44a0a46f59b30d7ec1e0e5f4425c. --- app/views/producer_mailer/order_cycle_report.html.haml | 6 +++--- spec/mailers/producer_mailer_spec.rb | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/producer_mailer/order_cycle_report.html.haml b/app/views/producer_mailer/order_cycle_report.html.haml index 5f16d8ef6b..d74d13685f 100644 --- a/app/views/producer_mailer/order_cycle_report.html.haml +++ b/app/views/producer_mailer/order_cycle_report.html.haml @@ -25,7 +25,7 @@ = t :price %th.text-right = t :subtotal - -#%th.text-right + %th.text-right = t :included_tax %tbody - @line_items.each_pair do |variant, line_item| @@ -42,7 +42,7 @@ #{line_item.single_money} %td.text-right #{line_item.display_total} - -#%td.text-right + %td.text-right #{line_item.display_included_tax_amount} %tr.total-row %td @@ -52,7 +52,7 @@ %td %td.text-right #{@total} - -#%td.text-right + %td.text-right #{@tax_total} %p = t :producer_mail_text_after diff --git a/spec/mailers/producer_mailer_spec.rb b/spec/mailers/producer_mailer_spec.rb index b27245abe2..01042b56f2 100644 --- a/spec/mailers/producer_mailer_spec.rb +++ b/spec/mailers/producer_mailer_spec.rb @@ -68,6 +68,7 @@ describe ProducerMailer do end it "includes the total" do + puts mail.text_part.body.encoded mail.body.encoded.should include 'Total: $30.00' Capybara.string(mail.html_part.body.encoded) .find("tr.total-row")