From cb342529b3da59c10db9731fa8cf0fcadff3b7e9 Mon Sep 17 00:00:00 2001 From: magnolia61 Date: Wed, 6 Nov 2019 08:52:02 +0100 Subject: [PATCH 1/2] Additional changes to workflow message templates --- .../message_templates/case_activity_html.tpl | 2 +- .../contribution_dupalert_html.tpl | 2 +- .../contribution_offline_receipt_html.tpl | 2 +- .../contribution_online_receipt_html.tpl | 4 +- .../contribution_recurring_billing_html.tpl | 6 +- .../contribution_recurring_cancelled_html.tpl | 2 +- .../contribution_recurring_edit_html.tpl | 2 +- .../contribution_recurring_notify_html.tpl | 2 +- .../event_offline_receipt_html.tpl | 4 +- .../event_offline_receipt_text.tpl | 2 +- .../event_online_receipt_html.tpl | 12 +- .../event_registration_receipt_html.tpl | 2 +- .../message_templates/friend_html.tpl | 2 +- .../membership_autorenew_billing_html.tpl | 6 +- .../membership_autorenew_cancelled_html.tpl | 4 +- .../membership_offline_receipt_html.tpl | 2 +- .../membership_online_receipt_html.tpl | 4 +- .../participant_cancelled_html.tpl | 2 +- .../participant_confirm_html.tpl | 9 +- .../participant_expired_html.tpl | 2 +- .../participant_transferred_html.tpl | 2 +- .../payment_or_refund_notification_html.tpl | 167 +++++++++--------- .../payment_or_refund_notification_text.tpl | 27 +-- .../message_templates/pcp_notify_html.tpl | 2 +- .../pcp_owner_notify_html.tpl | 2 +- .../pcp_status_change_html.tpl | 2 +- .../pcp_supporter_notify_html.tpl | 2 +- .../pledge_acknowledge_html.tpl | 2 +- .../pledge_reminder_html.tpl | 2 +- .../message_templates/test_preview_html.tpl | 2 +- .../message_templates/uf_notify_html.tpl | 2 +- 31 files changed, 139 insertions(+), 146 deletions(-) diff --git a/xml/templates/message_templates/case_activity_html.tpl b/xml/templates/message_templates/case_activity_html.tpl index 0dcc6c47656..d430b2c7247 100644 --- a/xml/templates/message_templates/case_activity_html.tpl +++ b/xml/templates/message_templates/case_activity_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
- +
diff --git a/xml/templates/message_templates/contribution_dupalert_html.tpl b/xml/templates/message_templates/contribution_dupalert_html.tpl index 0f782a9c980..945e4d5d2f5 100644 --- a/xml/templates/message_templates/contribution_dupalert_html.tpl +++ b/xml/templates/message_templates/contribution_dupalert_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
diff --git a/xml/templates/message_templates/contribution_offline_receipt_html.tpl b/xml/templates/message_templates/contribution_offline_receipt_html.tpl index 0b2a22415ce..c68ad33d0a7 100644 --- a/xml/templates/message_templates/contribution_offline_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_offline_receipt_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
diff --git a/xml/templates/message_templates/contribution_online_receipt_html.tpl b/xml/templates/message_templates/contribution_online_receipt_html.tpl index 1bf18025383..7037de3370a 100644 --- a/xml/templates/message_templates/contribution_online_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_online_receipt_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
@@ -33,7 +33,7 @@
- +
{if $amount} diff --git a/xml/templates/message_templates/contribution_recurring_billing_html.tpl b/xml/templates/message_templates/contribution_recurring_billing_html.tpl index 14df6973eb5..e166bbaf399 100644 --- a/xml/templates/message_templates/contribution_recurring_billing_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_billing_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
@@ -28,8 +28,8 @@
- - +
+ diff --git a/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl b/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl index d04dd909a3b..f0b74f1f5c3 100644 --- a/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
{ts}Billing Name and Address{/ts}
+
diff --git a/xml/templates/message_templates/contribution_recurring_edit_html.tpl b/xml/templates/message_templates/contribution_recurring_edit_html.tpl index c1a9ae77ca1..cb4b4d60a86 100644 --- a/xml/templates/message_templates/contribution_recurring_edit_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_edit_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
diff --git a/xml/templates/message_templates/contribution_recurring_notify_html.tpl b/xml/templates/message_templates/contribution_recurring_notify_html.tpl index b5a7412beb6..af980b704b3 100644 --- a/xml/templates/message_templates/contribution_recurring_notify_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_notify_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl index 580419dace8..876a478e017 100644 --- a/xml/templates/message_templates/event_offline_receipt_html.tpl +++ b/xml/templates/message_templates/event_offline_receipt_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
@@ -21,7 +21,7 @@
-

{contact.email_greeting}

+ {assign var="greeting" value="{contact.email_greeting}"}{if $greeting}

{$greeting},

{/if} {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}

{$event.confirm_email_text|htmlize}

diff --git a/xml/templates/message_templates/event_offline_receipt_text.tpl b/xml/templates/message_templates/event_offline_receipt_text.tpl index c8578b09e68..e128670c91d 100644 --- a/xml/templates/message_templates/event_offline_receipt_text.tpl +++ b/xml/templates/message_templates/event_offline_receipt_text.tpl @@ -1,4 +1,4 @@ -{contact.email_greeting} +{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if} {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} {$event.confirm_email_text} {/if} diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl index 3bd5adbff7e..c9e08062567 100644 --- a/xml/templates/message_templates/event_online_receipt_html.tpl +++ b/xml/templates/message_templates/event_online_receipt_html.tpl @@ -15,7 +15,7 @@
- +
@@ -56,7 +56,7 @@ {/if} - -
- +
- - - + + + {/if}
{ts}Event Information and Location{/ts} @@ -246,9 +246,9 @@ {if $individual}
{ts}Participant Total{/ts}{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalAmtWithTax|crmMoney}{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalAmtWithTax|crmMoney}
@@ -503,8 +503,6 @@
diff --git a/xml/templates/message_templates/event_registration_receipt_html.tpl b/xml/templates/message_templates/event_registration_receipt_html.tpl index 810f995dd4a..02280565811 100644 --- a/xml/templates/message_templates/event_registration_receipt_html.tpl +++ b/xml/templates/message_templates/event_registration_receipt_html.tpl @@ -67,7 +67,7 @@ {$source} {/if}

 

- +
{if $line_items} diff --git a/xml/templates/message_templates/friend_html.tpl b/xml/templates/message_templates/friend_html.tpl index 8ebd8c2a6d5..7ae4c95b76c 100644 --- a/xml/templates/message_templates/friend_html.tpl +++ b/xml/templates/message_templates/friend_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
diff --git a/xml/templates/message_templates/membership_autorenew_billing_html.tpl b/xml/templates/message_templates/membership_autorenew_billing_html.tpl index 9ff740f8b7d..13730bc1cc7 100644 --- a/xml/templates/message_templates/membership_autorenew_billing_html.tpl +++ b/xml/templates/message_templates/membership_autorenew_billing_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
@@ -28,8 +28,8 @@
- - +
+ diff --git a/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl b/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl index a06f666d5da..186c42d645f 100644 --- a/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl +++ b/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
{ts}Billing Name and Address{/ts}
+
@@ -27,7 +27,7 @@
- +
diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl index 3c34f9cdb96..6d1edc17618 100644 --- a/xml/templates/message_templates/membership_offline_receipt_html.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
- +
diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl index cf99a796802..f497c16f65b 100644 --- a/xml/templates/message_templates/membership_online_receipt_html.tpl +++ b/xml/templates/message_templates/membership_online_receipt_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
@@ -33,7 +33,7 @@
- +
{if $membership_assign && !$useForMember} diff --git a/xml/templates/message_templates/participant_cancelled_html.tpl b/xml/templates/message_templates/participant_cancelled_html.tpl index 062f610cb7d..3a1641b97c7 100644 --- a/xml/templates/message_templates/participant_cancelled_html.tpl +++ b/xml/templates/message_templates/participant_cancelled_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
diff --git a/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl index c4535e42d31..75745fd10fd 100644 --- a/xml/templates/message_templates/participant_confirm_html.tpl +++ b/xml/templates/message_templates/participant_confirm_html.tpl @@ -11,8 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
- +
@@ -34,14 +33,14 @@ {/if} {if $event.allow_selfcancelxfer } - {ts}This event allows for self-cancel or transfer{/ts} + {ts}This event allows for{/ts} {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participantID`&{contact.checksum}" h=0 a=1 fe=1}{/capture} - {ts}Self service cancel transfer{/ts} + {ts}self service cancel or transfer{/ts} {/if} diff --git a/xml/templates/message_templates/participant_expired_html.tpl b/xml/templates/message_templates/participant_expired_html.tpl index 290a37cf246..65944715b8b 100644 --- a/xml/templates/message_templates/participant_expired_html.tpl +++ b/xml/templates/message_templates/participant_expired_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
{capture assign=confirmUrl}{crmURL p='civicrm/event/confirm' q="reset=1&participantId=`$participant.id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture} - {ts}Go to a web page where you can confirm your registration online{/ts} + {ts}Click here to confirm and complete your registration{/ts}
+
diff --git a/xml/templates/message_templates/participant_transferred_html.tpl b/xml/templates/message_templates/participant_transferred_html.tpl index 9a21f1b010d..2c0b5ebf7ce 100644 --- a/xml/templates/message_templates/participant_transferred_html.tpl +++ b/xml/templates/message_templates/participant_transferred_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
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 a038a67c7d1..1a47eef4090 100644 --- a/xml/templates/message_templates/payment_or_refund_notification_html.tpl +++ b/xml/templates/message_templates/payment_or_refund_notification_html.tpl @@ -13,7 +13,7 @@ {capture assign=emptyBlockValueStyle }style="padding: 10px; border-bottom: 1px solid #999;"{/capture}
-
+
@@ -22,20 +22,88 @@ {/if} + {assign var="greeting" value="{contact.email_greeting}"}{if $greeting}

{$greeting},

{/if} {if $isRefund} -

{ts}A refund has been issued based on changes in your registration selections.{/ts}

+

{ts}A refund has been issued based on changes in your registration selections.{/ts}

{else} -

{ts}A payment has been received.{/ts}

+

{ts}Below you will find a receipt for this payment.{/ts}

+ {if $paymentsComplete} +

{ts}Thank you for completing this contribution.{/ts}

+ {/if} {/if} 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 1b0d798140e..396573290a0 100644 --- a/xml/templates/message_templates/payment_or_refund_notification_text.tpl +++ b/xml/templates/message_templates/payment_or_refund_notification_text.tpl @@ -4,7 +4,10 @@ {if $isRefund} {ts}A refund has been issued based on changes in your registration selections.{/ts} {else} -{ts}A payment has been received.{/ts} +{ts}Below you will find a receipt for this payment.{/ts} +{/if} +{if $paymentsComplete} +{ts}Thank you for completing this payment.{/ts} {/if} {if $isRefund} @@ -13,10 +16,8 @@ {ts}Refund Details{/ts} =============================================================================== -{ts}Total Fees{/ts}: {$totalAmount|crmMoney} -{ts}You Paid{/ts}: {$totalPaid|crmMoney} +{ts}This Refund Amount{/ts}: {$refundAmount|crmMoney} ------------------------------------------------------------------------------------ -{ts}Refund Amount{/ts}: {$refundAmount|crmMoney} {else} =============================================================================== @@ -24,16 +25,9 @@ {ts}Payment Details{/ts} =============================================================================== -{ts}Total Fees{/ts}: {$totalAmount|crmMoney} {ts}This Payment Amount{/ts}: {$paymentAmount|crmMoney} ------------------------------------------------------------------------------------ -{ts}Balance Owed{/ts}: {$amountOwed|crmMoney} {* This will be zero after final payment. *} -{if $paymentsComplete} - -{ts}Thank you for completing this payment.{/ts} -{/if} -{/if} {if $receive_date} {ts}Transaction Date{/ts}: {$receive_date|crmDate} {/if} @@ -46,6 +40,17 @@ {if $checkNumber} {ts}Check Number{/ts}: {$checkNumber} {/if} + +=============================================================================== + +{ts}Contribution Details{/ts} + +=============================================================================== +{ts}Total Amount{/ts}: {$totalAmount|crmMoney} +{ts}Totally Paid{/ts}: {$totalPaid|crmMoney} +{ts}Balance Owed{/ts}: {$amountOwed|crmMoney} {* This will be zero after final payment. *} + + {if $billingName || $address} =============================================================================== diff --git a/xml/templates/message_templates/pcp_notify_html.tpl b/xml/templates/message_templates/pcp_notify_html.tpl index 6e8e8b230dc..c1d8fd4669b 100644 --- a/xml/templates/message_templates/pcp_notify_html.tpl +++ b/xml/templates/message_templates/pcp_notify_html.tpl @@ -12,7 +12,7 @@ {capture assign=pcpURL }{crmURL p="civicrm/pcp/info" q="reset=1&id=`$pcpId`" h=0 a=1}{/capture}
-
- {if $emailGreeting}
{$emailGreeting},
- {if $isRefund} + {if $isRefund} + + + + + + + + {else} + + + + + + + + {/if} + {if $receive_date} + + + + + {/if} + {if $trxn_id} + + + + + {/if} + {if $paidBy} + + + + + {/if} + {if $checkNumber} + + + + + {/if} + - + {* This will be zero after final payment. *} - {else} - - - - - - - - - - - - - - {* This will be zero after final payment. *} - - - - {if $paymentsComplete} - - - - {/if} - {/if} - {if $receive_date} - - - - - {/if} - {if $trxn_id} - - - - - {/if} - {if $paidBy} - - - - - {/if} - {if $checkNumber} - - - - - {/if}
{ts}Refund Details{/ts}
+ {ts}This Refund Amount{/ts} + + {$refundAmount|crmMoney} +
{ts}Payment Details{/ts}
+ {ts}This Payment Amount{/ts} + + {$paymentAmount|crmMoney} +
+ {ts}Transaction Date{/ts} + + {$receive_date|crmDate} +
+ {ts}Transaction #{/ts} + + {$trxn_id} +
+ {ts}Paid By{/ts} + + {$paidBy} +
+ {ts}Check Number{/ts} + + {$checkNumber} +
{ts}Refund Details{/ts}{ts}Contribution Details{/ts}
@@ -47,7 +115,7 @@
- {ts}You Paid{/ts} + {ts}Totally Paid{/ts} {$totalPaid|crmMoney} @@ -55,91 +123,14 @@
- {ts}Refund Amount{/ts} + {ts}Balance Owed{/ts} - {$refundAmount|crmMoney} - + {$amountOwed|crmMoney} +
{ts}Payment Details{/ts}
- {ts}Total Amount{/ts} - - {$totalAmount|crmMoney} -
- {ts}This Payment Amount{/ts} - - {$paymentAmount|crmMoney} -
- {ts}Balance Owed{/ts} - - {$amountOwed|crmMoney} -
- {ts}Thank you for completing this payment.{/ts} -
- {ts}Transaction Date{/ts} - - {$receive_date|crmDate} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts}Paid By{/ts} - - {$paidBy} -
- {ts}Check Number{/ts} - - {$checkNumber} -
+
+
diff --git a/xml/templates/message_templates/pcp_owner_notify_html.tpl b/xml/templates/message_templates/pcp_owner_notify_html.tpl index 6ceb77c35a3..73c02a4c996 100644 --- a/xml/templates/message_templates/pcp_owner_notify_html.tpl +++ b/xml/templates/message_templates/pcp_owner_notify_html.tpl @@ -18,7 +18,7 @@ {ts}The donor's name has been added to your honor roll unless they asked not to be included.{/ts}
{/if}

-
+
diff --git a/xml/templates/message_templates/pcp_status_change_html.tpl b/xml/templates/message_templates/pcp_status_change_html.tpl index 1e69086fb2d..1e4f85db5ef 100644 --- a/xml/templates/message_templates/pcp_status_change_html.tpl +++ b/xml/templates/message_templates/pcp_status_change_html.tpl @@ -7,7 +7,7 @@
-
{ts}Received{/ts}: {$receive_date|crmDate}
{ts}Amount{/ts}: {$total_amount|crmMoney:$currency}
{ts}Name{/ts}: {$donors_display_name}
+
diff --git a/xml/templates/message_templates/pcp_supporter_notify_html.tpl b/xml/templates/message_templates/pcp_supporter_notify_html.tpl index a3e2c389e57..7eb01381385 100644 --- a/xml/templates/message_templates/pcp_supporter_notify_html.tpl +++ b/xml/templates/message_templates/pcp_supporter_notify_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
diff --git a/xml/templates/message_templates/pledge_acknowledge_html.tpl b/xml/templates/message_templates/pledge_acknowledge_html.tpl index eacdc2ae4ea..abd2088b04d 100644 --- a/xml/templates/message_templates/pledge_acknowledge_html.tpl +++ b/xml/templates/message_templates/pledge_acknowledge_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
diff --git a/xml/templates/message_templates/pledge_reminder_html.tpl b/xml/templates/message_templates/pledge_reminder_html.tpl index f59fd86f4ba..b6f883bc653 100644 --- a/xml/templates/message_templates/pledge_reminder_html.tpl +++ b/xml/templates/message_templates/pledge_reminder_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
+
diff --git a/xml/templates/message_templates/test_preview_html.tpl b/xml/templates/message_templates/test_preview_html.tpl index 131da32e6e8..73c6aefa600 100644 --- a/xml/templates/message_templates/test_preview_html.tpl +++ b/xml/templates/message_templates/test_preview_html.tpl @@ -1,5 +1,5 @@
-
+

{ts}Test-drive Email / Receipt{/ts}

diff --git a/xml/templates/message_templates/uf_notify_html.tpl b/xml/templates/message_templates/uf_notify_html.tpl index 5ef389725c9..524ff145a29 100644 --- a/xml/templates/message_templates/uf_notify_html.tpl +++ b/xml/templates/message_templates/uf_notify_html.tpl @@ -11,7 +11,7 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
- +
From 84060348e6831f43895860b9a76574587dc2efed Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 7 Nov 2019 06:44:21 +1100 Subject: [PATCH 2/2] Fix Smarty Syntax in payment_or_refund_notification_text template and update unit tests to match the change in langauge in the templates --- .../CRM/Contribute/Form/AdditionalPaymentTest.php | 10 +++++----- tests/phpunit/api/v3/PaymentTest.php | 10 +++++----- .../payment_or_refund_notification_text.tpl | 2 +- 3 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 7c3e9e40cdb..5078bdda2f8 100644 --- a/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php +++ b/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php @@ -149,7 +149,7 @@ public function testAddPaymentUsingCreditCardForPartiallyPaidContribution() { 'From: site@something.com', 'Dear Anthony,', 'Payment Details', - 'Total Fees: $ 100.00', + 'Total Amount: $ 100.00', 'This Payment Amount: $ 70.00', 'Balance Owed: $ 0.00 ', 'Billing Name and Address', @@ -238,8 +238,8 @@ public function testMultiplePaymentForPartiallyPaidContributionWithOneCreditCard $mut->assertSubjects(['Payment Receipt - Mr. Anthony Anderson II']); $mut->checkMailLog([ 'Dear Anthony,', - 'A payment has been received', - 'Total Fees: $ 100.00', + 'Below you will find a receipt for this payment.', + 'Total Amount: $ 100.00', 'This Payment Amount: $ 50.00', 'Balance Owed: $ 20.00 ', 'Paid By: Check', @@ -268,8 +268,8 @@ public function testAddPaymentUsingCreditCardForPendingPayLaterContribution() { $this->checkResults([100], 1); $mut->checkMailLog([ - 'A payment has been received', - 'Total Fees: $ 100.00', + 'Below you will find a receipt for this payment.', + 'Total Amount: $ 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 66de216a2eb..74027bfa619 100644 --- a/tests/phpunit/api/v3/PaymentTest.php +++ b/tests/phpunit/api/v3/PaymentTest.php @@ -183,7 +183,7 @@ public function testPaymentEmailReceipt() { $mut->checkMailLog([ 'From: "FIXME" ', 'Dear Anthony,', - 'Total Fees: $ 300.00', + 'Total Amount: $ 300.00', 'This Payment Amount: $ 50.00', //150 was paid in the 1st payment. 'Balance Owed: $ 100.00', @@ -221,8 +221,8 @@ public function testPaymentEmailReceiptFullyPaid() { $mut->checkMailLog([ 'From: "FIXME" ', 'Dear Anthony,', - 'A payment has been received.', - 'Total Fees: $ 300.00', + 'Below you will find a receipt for this payment.', + 'Total Amount: $ 300.00', 'This Payment Amount: $ 150.00', 'Balance Owed: $ 0.00', 'Thank you for completing this payment.', @@ -273,12 +273,12 @@ public function testRefundEmailReceipt($thousandSeparator) { $mut->checkMailLog([ 'Dear Anthony,', 'A refund has been issued based on changes in your registration selections.', - 'Total Fees: $ 300' . $decimalSeparator . '00', + 'Total Amount: $ 300' . $decimalSeparator . '00', 'Refund Amount: $ -30' . $decimalSeparator . '00', 'Event Information and Location', 'Paid By: Check', 'Transaction Date: November 13th, 2018 12:01 PM', - 'You Paid: $ 170' . $decimalSeparator . '00', + 'Totally Paid: $ 170' . $decimalSeparator . '00', ]); $mut->stop(); $mut->clearMessages(); 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 396573290a0..0a4688e1f27 100644 --- a/xml/templates/message_templates/payment_or_refund_notification_text.tpl +++ b/xml/templates/message_templates/payment_or_refund_notification_text.tpl @@ -27,7 +27,7 @@ =============================================================================== {ts}This Payment Amount{/ts}: {$paymentAmount|crmMoney} ------------------------------------------------------------------------------------ - +{/if} {if $receive_date} {ts}Transaction Date{/ts}: {$receive_date|crmDate} {/if}