Merge remote branch 'canonical/master' into merge-20140930

[civicrm-core.git] / xml / templates / message_templates / membership_offline_receipt_html.tpl

diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl
index cd7be66db31ca9df2bc8eaa5345a60729da39137..45f339420fd2a64676029f2f4c7d36516040bbc5 100644 (file)
--- a/xml/templates/message_templates/membership_offline_receipt_html.tpl
+++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl
@@ -70,7 +70,7 @@
        </td>
       </tr>
       {/if}
-      {if $formValues.total_amount}
+      {if $formValues.total_amount OR $formValues.total_amount eq 0 }
        <tr>
         <th {$headerStyle}>
          {ts}Membership Fee{/ts}
@@ -116,14 +116,19 @@
                <td>
                 {$line.unit_price*$line.qty|crmMoney}
                </td>
+               {if $line.tax_rate != "" || $line.tax_amount != ""}
+                <td>
+                 {$line.tax_rate|string_format:"%.2f"}%
+                </td>
+                <td>
+                 {$line.tax_amount|crmMoney}
+                </td>
+               {else}
+                <td></td>
+                <td></td>
+               {/if}
                <td>
-                {$line.tax_rate|crmMoney}
-               </td>
-               <td>
-                {$line.tax_amount|crmMoney}
-               </td>
-               <td>
-                {$line.line_total|crmMoney}
+                {$line.line_total+$line.tax_amount|crmMoney}
                </td>
               {/if}
               <td>
@@ -150,17 +155,17 @@
        {foreach from=$dataArray item=value key=priceset}
         <tr>
         {if $priceset}
-          <td>&nbsp;VAT {$priceset|string_format:"%.2f"}%</td>    
-          <td>&nbsp;{$value|crmMoney:$currency}</td>
+         <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>    
+         <td>&nbsp;{$value|crmMoney:$currency}</td>
         {elseif  $priceset == 0}
-          <td>&nbsp;VAT</td>
-          <td>&nbsp;{$value|crmMoney:$currency}</td>
+         <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>
+         <td>&nbsp;{$value|crmMoney:$currency}</td>
         {/if}
         </tr>
        {/foreach}
       {/if}
       {/if}
-      {if $totalTaxAmount}
+      {if isset($totalTaxAmount)}
         <tr>
          <td {$labelStyle}>
           {ts}Total Tax Amount{/ts}