Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-20450 Update post upgrade message with correct list of modified t… #10223

Merged
merged 1 commit into from
Apr 24, 2017
Merged

CRM-20450 Update post upgrade message with correct list of modified t… #10223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<td colspan = "3"></td>
<td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
<td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
<td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
<td style = "padding-left:34px;"><font size = "1" align = "right"></font></td>
</tr>
{if $is_pay_later == 0}
<tr>
Expand All @@ -166,7 +166,7 @@
<td colspan = "3"></td>
<td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts}AMOUNT DUE:{/ts} </font></b></td>
<td style = "padding-left:34px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
<td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
<td style = "padding-left:34px;"><font size = "1" align = "right"></font></td>
</tr>
{/if}
<br/><br/><br/>
Expand Down Expand Up @@ -406,7 +406,7 @@
<td colspan = "3"></td>
<td style = "padding-left:28px;text-align:right;"><b><font size = "1">{ts}REMAINING CREDIT{/ts}</font></b></td>
<td style = "padding-left:28px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
<td style = "padding-left:28px;"><font size = "1" align = "right"></fonts></td>
<td style = "padding-left:28px;"><font size = "1" align = "right"></font></td>
</tr>
{/if}
<br/><br/><br/>
Expand Down
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/php/FourSeven.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
. '</p>';
}
if ($rev == '4.7.19') {
$postUpgradeMessage .= '<br /><br />' . ts('Default version of the following System Workflow Message Templates have been modified: <ul><li>Additional Payment Receipt or Refund Notification</li></ul> 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 .= '<br /><br />' . ts('Default version of the following System Workflow Message Templates have been modified: <ul><li>Additional Payment Receipt or Refund Notification</li><li>Contribution Invoice</li></ul> 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) {
Expand Down
6 changes: 3 additions & 3 deletions xml/templates/message_templates/contribution_invoice_receipt_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<td colspan = "3"></td>
<td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
<td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
<td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
<td style = "padding-left:34px;"><font size = "1" align = "right"></font></td>
</tr>
{if $is_pay_later == 0}
<tr>
Expand All @@ -166,7 +166,7 @@
<td colspan = "3"></td>
<td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts}AMOUNT DUE:{/ts} </font></b></td>
<td style = "padding-left:34px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
<td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
<td style = "padding-left:34px;"><font size = "1" align = "right"></font></td>
</tr>
{/if}
<br/><br/><br/>
Expand Down Expand Up @@ -406,7 +406,7 @@
<td colspan = "3"></td>
<td style = "padding-left:28px;text-align:right;"><b><font size = "1">{ts}REMAINING CREDIT{/ts}</font></b></td>
<td style = "padding-left:28px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
<td style = "padding-left:28px;"><font size = "1" align = "right"></fonts></td>
<td style = "padding-left:28px;"><font size = "1" align = "right"></font></td>
</tr>
{/if}
<br/><br/><br/>
Expand Down