Merge branch 'CRM-20460' into CRM-20460-4.7

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

diff --git a/xml/templates/message_templates/payment_or_refund_notification_text.tpl b/xml/templates/message_templates/payment_or_refund_notification_text.tpl
index a09ad9e162a85479edd2414548b3c93873994ef7..c713864c05f4d230dac5eed3179a7886c1deb306 100644 (file)
--- a/xml/templates/message_templates/payment_or_refund_notification_text.tpl
+++ b/xml/templates/message_templates/payment_or_refund_notification_text.tpl
@@ -1,7 +1,5 @@
 Dear {$contactDisplayName}
-{if $paymentConfig.confirm_email_text}
-{$paymentConfig.confirm_email_text}
-{elseif $isRefund}
+{if $isRefund}
 {ts}A refund has been issued based on changes in your registration selections.{/ts}
 {else}
 {ts}A payment has been received.{/ts}
@@ -33,7 +31,7 @@ Dear {$contactDisplayName}
 
 {if $paymentsComplete}
 
-{ts}Thank-you. This completes your payment for {/ts}{if $component eq 'event'}{$event.event_title}{/if}.
+{ts}Thank you for completing payment.{/ts}
 {/if}
 {/if}
 {if $receive_date}
@@ -80,7 +78,7 @@ Dear {$contactDisplayName}
 {$event.event_title}
 {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}
 
-{if $event.participant_role neq 'Attendee' and $defaultRole}
+{if $event.participant_role}
 {ts}Participant Role{/ts}: {$event.participant_role}
 {/if}