killbill-aplcache

fix for invoice template bug

5/30/2012 2:59:30 PM

Details

diff --git a/invoice/src/test/java/com/ning/billing/invoice/HtmlInvoiceGeneratorTest.java b/invoice/src/test/java/com/ning/billing/invoice/HtmlInvoiceGeneratorTest.java
index 95f39c9..144fb13 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/HtmlInvoiceGeneratorTest.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/HtmlInvoiceGeneratorTest.java
@@ -90,7 +90,7 @@ public class HtmlInvoiceGeneratorTest {
         zombie.addResult("getInvoiceDate", startDate);
         zombie.addResult("getInvoiceNumber", 42);
         zombie.addResult("getCurrency", Currency.USD);
-        zombie.addResult("getTotalAmount", price1.add(price2));
+        zombie.addResult("getAmountCharged", price1.add(price2));
         zombie.addResult("getAmountPaid", BigDecimal.ZERO);
         zombie.addResult("getBalance", price1.add(price2));
 
diff --git a/util/src/main/resources/com/ning/billing/util/email/templates/HtmlInvoiceTemplate.mustache b/util/src/main/resources/com/ning/billing/util/email/templates/HtmlInvoiceTemplate.mustache
index 73c70b3..aef1dce 100644
--- a/util/src/main/resources/com/ning/billing/util/email/templates/HtmlInvoiceTemplate.mustache
+++ b/util/src/main/resources/com/ning/billing/util/email/templates/HtmlInvoiceTemplate.mustache
@@ -78,7 +78,7 @@
             <tr>
                 <td colspan=2 />
                 <td align=right><strong>{{text.invoiceAmount}}</strong></td>
-                <td align=right><strong>{{invoice.totalAmount}}</strong></td>
+                <td align=right><strong>{{invoice.amountCharged}}</strong></td>
             </tr>
             <tr>
                 <td colspan=2 />