From 1f6479af81e22efb123209f10c6aa77101ff2c11 Mon Sep 17 00:00:00 2001
From: magnolia61 <richard.van.oosterhout@gmail.com>
Date: Thu, 7 Nov 2019 00:38:40 +0100
Subject: [PATCH] changed wording to Total Fee & Total Paid

---
 .../phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php | 6 +++---
 tests/phpunit/api/v3/PaymentTest.php                      | 8 ++++----
 .../payment_or_refund_notification_html.tpl               | 4 ++--
 .../payment_or_refund_notification_text.tpl               | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php b/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
index 9effd2619d..f4b0bb9e0f 100644
--- a/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
@@ -149,7 +149,7 @@ class CRM_Contribute_Form_AdditionalPaymentTest extends CiviUnitTestCase {
       'From: site@something.com',
       'Dear Anthony,',
       'Payment Details',
-      'Total Amount: $ 100.00',
+      'Total Fee: $ 100.00',
       'This Payment Amount: $ 70.00',
       'Balance Owed: $ 0.00 ',
       'Billing Name and Address',
@@ -242,7 +242,7 @@ class CRM_Contribute_Form_AdditionalPaymentTest extends CiviUnitTestCase {
     $mut->checkMailLog([
       'Dear Anthony,',
       'Below you will find a receipt for this payment.',
-      'Total Amount: $ 100.00',
+      'Total Fee: $ 100.00',
       'This Payment Amount: $ 50.00',
       'Balance Owed: $ 20.00 ',
       'Paid By: Check',
@@ -273,7 +273,7 @@ class CRM_Contribute_Form_AdditionalPaymentTest extends CiviUnitTestCase {
 
     $mut->checkMailLog([
       'Below you will find a receipt for this payment.',
-      'Total Amount: $ 100.00',
+      'Total Fee: $ 100.00',
       'This Payment Amount: $ 100.00',
       'Balance Owed: $ 0.00 ',
       'Paid By: Credit Card',
diff --git a/tests/phpunit/api/v3/PaymentTest.php b/tests/phpunit/api/v3/PaymentTest.php
index 76410ad8d3..495639f98f 100644
--- a/tests/phpunit/api/v3/PaymentTest.php
+++ b/tests/phpunit/api/v3/PaymentTest.php
@@ -189,7 +189,7 @@ class api_v3_PaymentTest extends CiviUnitTestCase {
     $mut->checkMailLog([
       'From: "FIXME" <info@EXAMPLE.ORG>',
       'Dear Anthony,',
-      'Total Amount: $ 300.00',
+      'Total Fee: $ 300.00',
       'This Payment Amount: $ 50.00',
       //150 was paid in the 1st payment.
       'Balance Owed: $ 100.00',
@@ -229,7 +229,7 @@ class api_v3_PaymentTest extends CiviUnitTestCase {
       'From: "FIXME" <info@EXAMPLE.ORG>',
       'Dear Anthony,',
       'Below you will find a receipt for this payment.',
-      'Total Amount: $ 300.00',
+      'Total Fee: $ 300.00',
       'This Payment Amount: $ 150.00',
       'Balance Owed: $ 0.00',
       'Thank you for completing this payment.',
@@ -283,12 +283,12 @@ class api_v3_PaymentTest extends CiviUnitTestCase {
     $mut->checkMailLog([
       'Dear Anthony,',
       'A refund has been issued based on changes in your registration selections.',
-      'Total Amount: $ 300' . $decimalSeparator . '00',
+      'Total Fee: $ 300' . $decimalSeparator . '00',
       'Refund Amount: $ -30' . $decimalSeparator . '00',
       'Event Information and Location',
       'Paid By: Check',
       'Transaction Date: November 13th, 2018 12:01 PM',
-      'Totally Paid: $ 170' . $decimalSeparator . '00',
+      'Total Paid: $ 170' . $decimalSeparator . '00',
     ]);
     $mut->stop();
     $mut->clearMessages();
diff --git a/xml/templates/message_templates/payment_or_refund_notification_html.tpl b/xml/templates/message_templates/payment_or_refund_notification_html.tpl
index 1a47eef409..8a09aef437 100644
--- a/xml/templates/message_templates/payment_or_refund_notification_html.tpl
+++ b/xml/templates/message_templates/payment_or_refund_notification_html.tpl
@@ -107,7 +107,7 @@
   </tr>
   <tr>
     <td {$labelStyle}>
-      {ts}Total Amount{/ts}
+      {ts}Total Fee{/ts}
     </td>
     <td {$valueStyle}>
       {$totalAmount|crmMoney}
@@ -115,7 +115,7 @@
   </tr>
   <tr>
     <td {$labelStyle}>
-      {ts}Totally Paid{/ts}
+      {ts}Total Paid{/ts}
     </td>
     <td {$valueStyle}>
       {$totalPaid|crmMoney}
diff --git a/xml/templates/message_templates/payment_or_refund_notification_text.tpl b/xml/templates/message_templates/payment_or_refund_notification_text.tpl
index 0a4688e1f2..5529ec39da 100644
--- a/xml/templates/message_templates/payment_or_refund_notification_text.tpl
+++ b/xml/templates/message_templates/payment_or_refund_notification_text.tpl
@@ -46,8 +46,8 @@
 {ts}Contribution Details{/ts}
 
 ===============================================================================
-{ts}Total Amount{/ts}: {$totalAmount|crmMoney}
-{ts}Totally Paid{/ts}: {$totalPaid|crmMoney}
+{ts}Total Fee{/ts}: {$totalAmount|crmMoney}
+{ts}Total Paid{/ts}: {$totalPaid|crmMoney}
 {ts}Balance Owed{/ts}: {$amountOwed|crmMoney} {* This will be zero after final payment. *}
 
 
-- 
2.25.1