From 7dffc2a7146bacba0251484ffa88939d3f52837a Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Mon, 24 Apr 2017 12:26:28 +1000 Subject: [PATCH] CRM-20450 Update post upgrade message with correct list of modified templates and fix closing tag which should be font --- .../message_templates/contribution_invoice_receipt_html.tpl | 6 +++--- CRM/Upgrade/Incremental/php/FourSeven.php | 2 +- .../message_templates/contribution_invoice_receipt_html.tpl | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl index a938ca349d..0b5633f53b 100644 --- a/CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl +++ b/CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl @@ -143,7 +143,7 @@ {ts 1=$defaultCurrency}TOTAL %1{/ts} {$amount|crmMoney:$currency} - + {if $is_pay_later == 0} @@ -166,7 +166,7 @@ {ts}AMOUNT DUE:{/ts} {$amountDue|crmMoney:$currency} - + {/if}


@@ -406,7 +406,7 @@ {ts}REMAINING CREDIT{/ts} {$amountDue|crmMoney:$currency} - + {/if}


diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index cf7209ab25..894afe1ba6 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -115,7 +115,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base . '

'; } if ($rev == '4.7.19') { - $postUpgradeMessage .= '

' . ts('Default version of the following System Workflow Message Templates have been modified:
  • Additional Payment Receipt or Refund Notification
If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages).'); + $postUpgradeMessage .= '

' . ts('Default version of the following System Workflow Message Templates have been modified:
  • Additional Payment Receipt or Refund Notification
  • Contribution Invoice
If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages).'); $check = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_domain"); $smsCheck = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_sms_provider"); if ($check > 1 && (bool) $smsCheck) { diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl index a938ca349d..0b5633f53b 100644 --- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl @@ -143,7 +143,7 @@ {ts 1=$defaultCurrency}TOTAL %1{/ts} {$amount|crmMoney:$currency} - + {if $is_pay_later == 0} @@ -166,7 +166,7 @@ {ts}AMOUNT DUE:{/ts} {$amountDue|crmMoney:$currency} - + {/if}


@@ -406,7 +406,7 @@ {ts}REMAINING CREDIT{/ts} {$amountDue|crmMoney:$currency} - + {/if}


-- 2.25.1