CRM-20400, fixed payment receipt

----------------------------------------
* CRM-20400: Update the Payment Receipt to use for Contribution pyament
  https://issues.civicrm.org/jira/browse/CRM-20400

diff --git a/xml/templates/message_templates/payment_or_refund_notification_html.tpl b/xml/templates/message_templates/payment_or_refund_notification_html.tpl
index 6d6efeb52de3d48694e9385a40ab94250aa34fce..cbaae6440104ccd51cc77b3670b1b3dbc246665e 100644 (file)
--- a/xml/templates/message_templates/payment_or_refund_notification_html.tpl
+++ b/xml/templates/message_templates/payment_or_refund_notification_html.tpl
@@ -24,9 +24,7 @@
 
   <tr>
     <td>
-      {if $paymentConfig.confirm_email_text}
-      <p>{$paymentConfig.confirm_email_text|htmlize}</p>
-      {elseif $isRefund}
+      {if $isRefund}
       <p>{ts}A refund has been issued based on changes in your registration selections.{/ts}</p>
       {else}
       <p>{ts}A payment has been received.{/ts}</p>
@@ -43,7 +41,7 @@
   </tr>
   <tr>
     <td {$labelStyle}>
-      {ts}Total Fees{/ts}
+      {ts}Total Amount{/ts}
     </td>
     <td {$valueStyle}>
       {$totalAmount|crmMoney}
@@ -71,26 +69,26 @@
     </tr>
     <tr>
       <td {$labelStyle}>
-  {ts}{if $component eq 'event'}Total Fees{/if}{/ts}
+        {ts}Total Amount{/ts}
       </td>
       <td {$valueStyle}>
-  {$totalAmount|crmMoney}
+        {$totalAmount|crmMoney}
       </td>
       </tr>
       <tr>
       <td {$labelStyle}>
-  {ts}This Payment Amount{/ts}
+        {ts}This Payment Amount{/ts}
       </td>
       <td {$valueStyle}>
-  {$paymentAmount|crmMoney}
+        {$paymentAmount|crmMoney}
       </td>
       </tr>
      <tr>
       <td {$labelStyle}>
-  {ts}Balance Owed{/ts}
+        {ts}Balance Owed{/ts}
       </td>
        <td {$valueStyle}>
-  {$amountOwed|crmMoney}
+         {$amountOwed|crmMoney}
       </td> {* This will be zero after final payment. *}
      </tr>
      <tr> <td {$emptyBlockStyle}></td>
@@ -98,7 +96,7 @@
       {if $paymentsComplete}
       <tr>
       <td colspan='2' {$valueStyle}>
-  {ts}Thank-you. This completes your payment for {if $component eq 'event'}{$event.event_title}{/if}.{/ts}
+        {ts}Thank-you. This completes your payment for {if $component eq 'event'}{$event.event_title}{/if}.{/ts}
       </td>
      </tr>
       {/if}
@@ -106,10 +104,10 @@
   {if $receive_date}
     <tr>
       <td {$labelStyle}>
-  {ts}Transaction Date{/ts}
+        {ts}Transaction Date{/ts}
       </td>
       <td {$valueStyle}>
-  {$receive_date|crmDate}
+        {$receive_date|crmDate}
       </td>
     </tr>
   {/if}
@@ -189,7 +187,7 @@
       </td>
     </tr>
 
-    {if $event.participant_role neq 'Attendee' and $defaultRole}
+    {if $event.participant_role}
     <tr>
       <td {$labelStyle}>
         {ts}Participant Role{/ts}

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..d8ae664013a4bcc5113cc61195977b3d3be3ea1f 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}
@@ -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}