From 6787709693851df5fb2809f7cf69da36f9d761dd Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 10 Dec 2015 11:57:37 +1100 Subject: [PATCH] LettuceShare report: total in unit value column and total blank --- lib/open_food_network/lettuce_share_report.rb | 2 +- spec/features/admin/reports_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/open_food_network/lettuce_share_report.rb b/lib/open_food_network/lettuce_share_report.rb index 1dc283eba8..a532c00983 100644 --- a/lib/open_food_network/lettuce_share_report.rb +++ b/lib/open_food_network/lettuce_share_report.rb @@ -25,8 +25,8 @@ module OpenFoodNetwork '', OptionValueNamer.new(variant).value, OptionValueNamer.new(variant).unit, - variant.price - gst(variant), variant.price, + '', gst(variant), grower_and_method(variant), variant.product.primary_taxon.name diff --git a/spec/features/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb index 9a00fd6fde..b3f42df669 100644 --- a/spec/features/admin/reports_spec.rb +++ b/spec/features/admin/reports_spec.rb @@ -324,7 +324,7 @@ feature %q{ click_link 'LettuceShare' page.should have_table_row ['PRODUCT', 'Description', 'Qty', 'Pack Size', 'Unit', 'Unit Price', 'Total', 'GST incl.', 'Grower and growing method', 'Taxon'].map(&:upcase) - page.should have_table_row ['Product 2', '100g', '', '100', 'g', '99.0', '99.0', '0', 'Supplier Name (Organic - NASAA 12345)', 'Taxon Name'] + page.should have_table_row ['Product 2', '100g', '', '100', 'g', '99.0', '', '0', 'Supplier Name (Organic - NASAA 12345)', 'Taxon Name'] end end