From 332848a7b7bb130aca0065583cf61ebca8cd1d97 Mon Sep 17 00:00:00 2001 From: Justin Freeman Date: Mon, 20 Sep 2021 10:39:23 +1000 Subject: [PATCH] CIVIBLD-279 Replace "Print Invoice" and "Print Invoice and Credit Note" buttons with label "Download Invoice" and "Download Invoice and Credit Note" --- templates/CRM/Contribute/Form/ContributionView.tpl | 6 +++--- templates/CRM/Contribute/Page/UserDashboard.tpl | 6 +++--- tests/phpunit/CRM/Contact/Page/View/UserDashBoardTest.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/CRM/Contribute/Form/ContributionView.tpl b/templates/CRM/Contribute/Form/ContributionView.tpl index 377ea50554..9a97a2d827 100644 --- a/templates/CRM/Contribute/Form/ContributionView.tpl +++ b/templates/CRM/Contribute/Form/ContributionView.tpl @@ -38,11 +38,11 @@ {if $invoicing && empty($is_template)}
- + {if $contribution_status != 'Refunded' && $contribution_status != 'Cancelled' } - {ts}Print Invoice{/ts} + {ts}Download Invoice{/ts} {else} - {ts}Print Invoice and Credit Note{/ts} + {ts}Download Invoice and Credit Note{/ts} {/if} diff --git a/templates/CRM/Contribute/Page/UserDashboard.tpl b/templates/CRM/Contribute/Page/UserDashboard.tpl index 70034d749b..e662f12044 100644 --- a/templates/CRM/Contribute/Page/UserDashboard.tpl +++ b/templates/CRM/Contribute/Page/UserDashboard.tpl @@ -49,11 +49,11 @@ {if call_user_func(array('CRM_Core_Permission','check'), 'view my invoices') OR call_user_func(array('CRM_Core_Permission','check'), 'access CiviContribute')} - + {if empty($row.contribution_status_name) || (!empty($row.contribution_status_name) && $row.contribution_status_name != 'Refunded' && $row.contribution_status_name != 'Cancelled') } - {ts}Print Invoice{/ts} + {ts}Download Invoice{/ts} {else} - {ts}Print Invoice and Credit Note{/ts} + {ts}Download Invoice and Credit Note{/ts} {/if} {/if} diff --git a/tests/phpunit/CRM/Contact/Page/View/UserDashBoardTest.php b/tests/phpunit/CRM/Contact/Page/View/UserDashBoardTest.php index 34e057cec7..fab96c7ce0 100644 --- a/tests/phpunit/CRM/Contact/Page/View/UserDashBoardTest.php +++ b/tests/phpunit/CRM/Contact/Page/View/UserDashBoardTest.php @@ -114,7 +114,7 @@ class CRM_Contact_Page_View_UserDashBoardTest extends CiviUnitTestCase { $expectedStrings = [ 'Your Contribution(s)', '', - 'Completed
Total AmountFinancial TypeReceived dateReceipt SentBalanceStatusCompletedPrint Invoice
Download Invoice