CRM-13965 : upgrade modifications

diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl
index a1def6b86be99e087b8dfa4f1ca0aecf6aaffde6..d7b143ffa1d36ffe44a8c983d52672f46b970834 100644 (file)
--- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl
+++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl
@@ -153,7 +153,7 @@
             <td colspan="2" {$valueStyle}>
              {$credit_card_type}<br />
              {$credit_card_number}<br />
-             {ts 1=$credit_card_exp_date|truncate:7:''|crmDate}Expires: %1{/ts}
+             {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:''|crmDate}
             </td>
           </tr>
          {/if}

diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_text.tpl
index 5b9a7b170488b6714142b51c6ea707fbb8a4c325..938fd8a33327699f07ba358366c8c2e601921f79 100644 (file)
--- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_text.tpl
+++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_text.tpl
@@ -1,13 +1,11 @@
 Dear {$contactDisplayName}
 {if $paymentConfig.confirm_email_text}
 {$paymentConfig.confirm_email_text}
-{else}
-{if $isRefund}
+{elseif $isRefund}
 {ts}A refund has been issued based on changes in your registration selections.{/ts}
 {else}
 {ts}A payment has been received.{/ts}
 {/if}
-{/if}
 
 {ts}Please print this confirmation for your records.{/ts}
 
@@ -36,7 +34,7 @@ Dear {$contactDisplayName}
 
 {ts}Thank-you. This completes your payment for {/ts}{if $component eq 'event'}{$event.event_title}{/if}.
 {/if}
-
+{/if}
 {if $receive_date}
 {ts}Transaction Date{/ts}: {$receive_date|crmDate}
 {/if}
@@ -71,8 +69,6 @@ Dear {$contactDisplayName}
 {$credit_card_number}
 {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
 {/if}
-{/if}
-{/if}
 {if $component eq 'event'}
 ===============================================================================