dev/financial#206 Switch templates to use token for tax_exclusive_amount

diff --git a/xml/templates/message_templates/contribution_online_receipt_html.tpl b/xml/templates/message_templates/contribution_online_receipt_html.tpl
index 832186120664f2885f3fda6635112ecce8ddc0ce..118a29f760247f0775ede230cc16f13e6a9f6986 100644 (file)
--- a/xml/templates/message_templates/contribution_online_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_online_receipt_html.tpl
@@ -85,7 +85,7 @@
             {ts} Amount before Tax : {/ts}
           </td>
           <td {$valueStyle}>
-            {$amount-$totalTaxAmount|crmMoney:$currency}
+            {contribution.tax_exclusive_amount}
           </td>
         </tr>
 

diff --git a/xml/templates/message_templates/contribution_online_receipt_text.tpl b/xml/templates/message_templates/contribution_online_receipt_text.tpl
index 2e4844feeed0dfef437654a536b815d17018115a..7aa62279256b18aa8a6a5378518516fef0c31a49 100644 (file)
--- a/xml/templates/message_templates/contribution_online_receipt_text.tpl
+++ b/xml/templates/message_templates/contribution_online_receipt_text.tpl
@@ -33,7 +33,7 @@
 {/foreach}
 
 {if $isShowTax && {contribution.tax_amount|boolean}}
-{ts}Amount before Tax:{/ts} {$amount-$totalTaxAmount|crmMoney:$currency}
+{ts}Amount before Tax:{/ts} {contribution.tax_exclusive_amount}
   {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
     {if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if} : {$taxDetail.amount|crmMoney:'{contribution.currency}'}
   {/foreach}

diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl
index 6d1f2200dc829e1ead6a0bee010b0962f13e06bf..5ce49faf0b32204c3b10816b78e2520f5b290652 100644 (file)
--- a/xml/templates/message_templates/membership_online_receipt_html.tpl
+++ b/xml/templates/message_templates/membership_online_receipt_html.tpl
@@ -211,7 +211,7 @@
           {ts}Amount Before Tax:{/ts}
          </td>
          <td {$valueStyle}>
-          {$amount-$totalTaxAmount|crmMoney}
+           {contribution.tax_exclusive_amount}
          </td>
         </tr>
         {foreach from=$dataArray item=value key=priceset}

diff --git a/xml/templates/message_templates/membership_online_receipt_text.tpl b/xml/templates/message_templates/membership_online_receipt_text.tpl
index b692a4fa8aedef36550776a5505da63fdb1d9eba..b6c4b78ecc0170a0b2ff92d70c90db734a65f2cb 100644 (file)
--- a/xml/templates/message_templates/membership_online_receipt_text.tpl
+++ b/xml/templates/message_templates/membership_online_receipt_text.tpl
@@ -70,7 +70,7 @@
 {/foreach}
 
 {if !empty($dataArray)}
-{ts}Amount before Tax:{/ts} {$amount-$totalTaxAmount|crmMoney:$currency}
+{ts}Amount before Tax:{/ts} {contribution.tax_exclusive_amount}
 
 {foreach from=$dataArray item=value key=priceset}
 {if $priceset || $priceset == 0}