Merge pull request #21546 from agileware/CIVIBLD-279

Replace "Print Invoice" and "Print Invoice and Credit Note" buttons with label "Download Invoice" and "Download Invoice and Credit Note"

diff --git a/templates/CRM/Contribute/Form/ContributionView.tpl b/templates/CRM/Contribute/Form/ContributionView.tpl
index 377ea50554b3b14303630cc92848d8bf24a0a8f9..9a97a2d827a04e79016b40dc97b67662d959322c 100644 (file)
--- a/templates/CRM/Contribute/Form/ContributionView.tpl
+++ b/templates/CRM/Contribute/Form/ContributionView.tpl
@@ -38,11 +38,11 @@
     {if $invoicing && empty($is_template)}
       <div class="css_right">
         <a class="button no-popup" href="{crmURL p='civicrm/contribute/invoice' q=$pdfUrlParams}">
-          <i class="crm-i fa-print" aria-hidden="true"></i>
+          <i class="crm-i fa-download" aria-hidden="true"></i>
         {if $contribution_status != 'Refunded' && $contribution_status != 'Cancelled' }
-          {ts}Print Invoice{/ts}</a>
+          {ts}Download Invoice{/ts}</a>
         {else}
-          {ts}Print Invoice and Credit Note{/ts}</a>
+          {ts}Download Invoice and Credit Note{/ts}</a>
         {/if}
         <a class="button" href="{crmURL p='civicrm/contribute/invoice/email' q=$emailUrlParams}">
           <i class="crm-i fa-paper-plane" aria-hidden="true"></i>

diff --git a/templates/CRM/Contribute/Page/UserDashboard.tpl b/templates/CRM/Contribute/Page/UserDashboard.tpl
index 70034d749b1980ffafeffa91e6c4e25660a816d1..e662f120446f36648375ff253bb8cbcb707d8904 100644 (file)
--- 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')}
                                 <a class="button no-popup nowrap"
                                    href="{crmURL p='civicrm/contribute/invoice' q=$urlParams}">
-                                    <i class="crm-i fa-print" aria-hidden="true"></i>
+                                    <i class="crm-i fa-download" aria-hidden="true"></i>
                                     {if empty($row.contribution_status_name) || (!empty($row.contribution_status_name) && $row.contribution_status_name != 'Refunded' && $row.contribution_status_name != 'Cancelled') }
-                                        <span>{ts}Print Invoice{/ts}</span>
+                                        <span>{ts}Download Invoice{/ts}</span>
                                     {else}
-                                        <span>{ts}Print Invoice and Credit Note{/ts}</span>
+                                        <span>{ts}Download Invoice and Credit Note{/ts}</span>
                                     {/if}
                                 </a>
                             {/if}

diff --git a/tests/phpunit/CRM/Contact/Page/View/UserDashBoardTest.php b/tests/phpunit/CRM/Contact/Page/View/UserDashBoardTest.php
index 34e057cec77a93d003a94f6196c4fb326c255908..fab96c7ce02f84e9045506e7155c067607eeef6b 100644 (file)
--- 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)',
       '<table class="selector"><tr class="columnheader"><th>Total Amount</th><th>Financial Type</th><th>Received date</th><th>Receipt Sent</th><th>Balance</th><th>Status</th><th></th>',
-      '<td>Completed</td><td><a class="button no-popup nowrap"href="/index.php?q=civicrm/contribute/invoice&amp;reset=1&amp;id=1&amp;cid=' . $this->contactID . '"><i class="crm-i fa-print" aria-hidden="true"></i><span>Print Invoice</span></a></td></tr><tr id=\'rowid2\'',
+      '<td>Completed</td><td><a class="button no-popup nowrap"href="/index.php?q=civicrm/contribute/invoice&amp;reset=1&amp;id=1&amp;cid=' . $this->contactID . '"><i class="crm-i fa-download" aria-hidden="true"></i><span>Download Invoice</span></a></td></tr><tr id=\'rowid2\'',
       'Pay Now',
     ];