Merge pull request #10379 from seanmadsen/CRM-20301

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

diff --git a/xml/templates/message_templates/contribution_online_receipt_text.tpl b/xml/templates/message_templates/contribution_online_receipt_text.tpl
index 6b60eadcd0bb5b06717976161af9b3c09b7e4205..c6328bc46e8921d9a50670ff3cb1e68b9b9d3dfa 100644 (file)
--- a/xml/templates/message_templates/contribution_online_receipt_text.tpl
+++ b/xml/templates/message_templates/contribution_online_receipt_text.tpl
@@ -40,7 +40,7 @@
 
 {foreach from=$dataArray item=value key=priceset}
 {if $priceset || $priceset == 0}
-{$taxTerm} {$priceset}%: {$value|crmMoney:$currency}
+{$taxTerm} {$priceset|string_format:"%.2f"}%: {$value|crmMoney:$currency}
 {else}
 {ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}
 {/if}
@@ -121,7 +121,7 @@
 {/if}
 
 {if !( $contributeMode eq 'notify' OR $contributeMode eq 'directIPN' ) and $is_monetary}
-{if $is_pay_later}
+{if $is_pay_later && !$isBillingAddressRequiredForPayLater}
 ===========================================================
 {ts}Registered Email{/ts}