Include Displayname in some workflow templates

diff --git a/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php b/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
index 4b8a52454aaa9e2fba201d95a2c4883ff6a8cde0..5ce2ed417831ba0c6b307f7b563672a2f1cde2a1 100644 (file)
--- a/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
@@ -136,7 +136,7 @@ class CRM_Contribute_Form_AdditionalPaymentTest extends CiviUnitTestCase {
     // pay additional amount by using Credit Card
     $this->submitPayment(70, 'live', TRUE);
     $this->checkResults([30, 70], 2);
-    $mut->assertSubjects(['Payment Receipt -']);
+    $mut->assertSubjects(['Payment Receipt - Mr. Anthony Anderson II']);
     $mut->checkMailLog([
       'From: site@something.com',
       'Dear Anthony,',
@@ -220,7 +220,7 @@ class CRM_Contribute_Form_AdditionalPaymentTest extends CiviUnitTestCase {
     // pay additional amount by using credit card
     $this->submitPayment(20, 'live');
     $this->checkResults([30, 50, 20], 3);
-    $mut->assertSubjects(['Payment Receipt -']);
+    $mut->assertSubjects(['Payment Receipt - Mr. Anthony Anderson II']);
     $mut->checkMailLog([
       'Dear Anthony,',
       'A payment has been received',

diff --git a/tests/phpunit/api/v3/PaymentTest.php b/tests/phpunit/api/v3/PaymentTest.php
index 953805b0a48da0e3582f5fa0b1c7b3661fbce519..4faa39bc40d568dfb9d82d04f87270df253a435a 100644 (file)
--- a/tests/phpunit/api/v3/PaymentTest.php
+++ b/tests/phpunit/api/v3/PaymentTest.php
@@ -179,7 +179,7 @@ class api_v3_PaymentTest extends CiviUnitTestCase {
     ]);
 
     $this->callAPISuccess('Payment', 'sendconfirmation', ['id' => $payment['id']]);
-    $mut->assertSubjects(['Payment Receipt - Annual CiviCRM meet']);
+    $mut->assertSubjects(['Payment Receipt - Annual CiviCRM meet - Mr. Anthony Anderson II']);
     $mut->checkMailLog([
       'From: "FIXME" <info@EXAMPLE.ORG>',
       'Dear Anthony,',
@@ -217,7 +217,7 @@ class api_v3_PaymentTest extends CiviUnitTestCase {
     // Here we set the email to an  invalid email & use check_permissions, domain email should be used.
     $email = $this->callAPISuccess('Email', 'create', ['contact_id' => 1, 'email' => 'bob@example.com']);
     $this->callAPISuccess('Payment', 'sendconfirmation', ['id' => $payment['id'], 'from' => $email['id'], 'check_permissions' => 1]);
-    $mut->assertSubjects(['Payment Receipt - Annual CiviCRM meet', 'Registration Confirmation - Annual CiviCRM meet']);
+    $mut->assertSubjects(['Payment Receipt - Annual CiviCRM meet - Mr. Anthony Anderson II', 'Registration Confirmation - Annual CiviCRM meet - Mr. Anthony Anderson II']);
     $mut->checkMailLog([
       'From: "FIXME" <info@EXAMPLE.ORG>',
       'Dear Anthony,',
@@ -269,7 +269,7 @@ class api_v3_PaymentTest extends CiviUnitTestCase {
     }
 
     $this->callAPISuccess('Payment', 'sendconfirmation', ['id' => $payment['id']]);
-    $mut->assertSubjects(['Refund Notification - Annual CiviCRM meet']);
+    $mut->assertSubjects(['Refund Notification - Annual CiviCRM meet - Mr. Anthony Anderson II']);
     $mut->checkMailLog([
       'Dear Anthony,',
       'A refund has been issued based on changes in your registration selections.',

diff --git a/xml/templates/message_templates/contribution_dupalert_subject.tpl b/xml/templates/message_templates/contribution_dupalert_subject.tpl
index 3e255fa5fb05faaea921361cbfcb83cbd4a6fff4..bb59208f22808e9a3060c36ad5b4feb5fb8dc784 100644 (file)
--- a/xml/templates/message_templates/contribution_dupalert_subject.tpl
+++ b/xml/templates/message_templates/contribution_dupalert_subject.tpl
@@ -1 +1 @@
-{ts}CiviContribute Alert: Possible Duplicate Contact Record{/ts}
+{ts}CiviContribute Alert: Possible Duplicate Contact Record{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl b/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl
index f99fe44750252079fc7d33c4c05b320ad1a3908d..aedf9255bcd90314765cf37f0d8f63a0f25ee7a0 100644 (file)
--- a/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl
+++ b/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl
@@ -9,3 +9,4 @@
 {else}
   {ts}Invoice{/ts}
 {/if}
+ - {contact.display_name}

diff --git a/xml/templates/message_templates/contribution_offline_receipt_subject.tpl b/xml/templates/message_templates/contribution_offline_receipt_subject.tpl
index a2e2f61c76501677a8dc475748227f171c5a906c..2a19c6e6c3b28d197de84ea1fea3ef468051b1c7 100644 (file)
--- a/xml/templates/message_templates/contribution_offline_receipt_subject.tpl
+++ b/xml/templates/message_templates/contribution_offline_receipt_subject.tpl
@@ -1 +1 @@
-{ts}Contribution Receipt{/ts}
+{ts}Contribution Receipt{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/contribution_online_receipt_subject.tpl b/xml/templates/message_templates/contribution_online_receipt_subject.tpl
index 32d4e402a82c44f576f5ec568449ab695210618c..052dce5bd7487c768fb4a07181a4872ca60c9ca5 100644 (file)
--- a/xml/templates/message_templates/contribution_online_receipt_subject.tpl
+++ b/xml/templates/message_templates/contribution_online_receipt_subject.tpl
@@ -1 +1 @@
-{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title}
+{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}

diff --git a/xml/templates/message_templates/contribution_recurring_billing_subject.tpl b/xml/templates/message_templates/contribution_recurring_billing_subject.tpl
index 69d9c9012910f8bf4d8f73cd6342c225fd733919..0a2a03b06449e484f266b0e4bd0023a0332f6129 100644 (file)
--- a/xml/templates/message_templates/contribution_recurring_billing_subject.tpl
+++ b/xml/templates/message_templates/contribution_recurring_billing_subject.tpl
@@ -1 +1 @@
-{ts}Recurring Contribution Billing Updates{/ts}
\ No newline at end of file
+{ts}Recurring Contribution Billing Updates{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/contribution_recurring_cancelled_subject.tpl b/xml/templates/message_templates/contribution_recurring_cancelled_subject.tpl
index d389480e14fa459af7d081a36b04e6d1fc2db320..2b5a4d805fba4762f3e99e3803d47cf86342c612 100644 (file)
--- a/xml/templates/message_templates/contribution_recurring_cancelled_subject.tpl
+++ b/xml/templates/message_templates/contribution_recurring_cancelled_subject.tpl
@@ -1 +1 @@
-{ts}Recurring Contribution Cancellation Notification{/ts}
+{ts}Recurring Contribution Cancellation Notification{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/contribution_recurring_edit_subject.tpl b/xml/templates/message_templates/contribution_recurring_edit_subject.tpl
index d4a5da1aea994aa1110343f53c27571e88d3e90b..3046495216239e1b061f129709d6353ec496e17c 100644 (file)
--- a/xml/templates/message_templates/contribution_recurring_edit_subject.tpl
+++ b/xml/templates/message_templates/contribution_recurring_edit_subject.tpl
@@ -1 +1 @@
-{ts}Recurring Contribution Update Notification{/ts}
\ No newline at end of file
+{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/contribution_recurring_notify_subject.tpl b/xml/templates/message_templates/contribution_recurring_notify_subject.tpl
index 0dfee3ad39252315160083fe79435650e2d25fcb..c9a9d927ad0ece830fb2d11eebe85084022a993d 100644 (file)
--- a/xml/templates/message_templates/contribution_recurring_notify_subject.tpl
+++ b/xml/templates/message_templates/contribution_recurring_notify_subject.tpl
@@ -1 +1 @@
-{ts}Recurring Contribution Notification{/ts}
+{ts}Recurring Contribution Notification{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/event_offline_receipt_subject.tpl b/xml/templates/message_templates/event_offline_receipt_subject.tpl
index 5cbe60c144e7ba638a9aa94a92b00ab4634631c5..e686b72f8c8494f66620559c73e83390763ebccd 100644 (file)
--- a/xml/templates/message_templates/event_offline_receipt_subject.tpl
+++ b/xml/templates/message_templates/event_offline_receipt_subject.tpl
@@ -1 +1 @@
-{ts}Event Confirmation{/ts} - {$event.title}
+{ts}Event Confirmation{/ts} - {$event.title} - {contact.display_name}

diff --git a/xml/templates/message_templates/event_online_receipt_subject.tpl b/xml/templates/message_templates/event_online_receipt_subject.tpl
index 709fb37aad7a4a368a0b1824606ba371f43fe0eb..7bb27306377a75307af7c30c9f2d313d60cd2b2e 100644 (file)
--- a/xml/templates/message_templates/event_online_receipt_subject.tpl
+++ b/xml/templates/message_templates/event_online_receipt_subject.tpl
@@ -1 +1 @@
-{if $isOnWaitlist}{ts}Wait List Confirmation{/ts}{elseif $isRequireApproval}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {$event.event_title}
+{if $isOnWaitlist}{ts}Wait List Confirmation{/ts}{elseif $isRequireApproval}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {$event.event_title} - {contact.display_name}

diff --git a/xml/templates/message_templates/event_registration_receipt_subject.tpl b/xml/templates/message_templates/event_registration_receipt_subject.tpl
index faed123a7f854d585aad54e3119629667c57c9ea..d6cb8cba8c679ecd7ccb2d91798e7f5139ff5722 100644 (file)
--- a/xml/templates/message_templates/event_registration_receipt_subject.tpl
+++ b/xml/templates/message_templates/event_registration_receipt_subject.tpl
@@ -1 +1 @@
-Receipt for {if $events_in_cart} Event Registration{/if}
+Receipt for {if $events_in_cart} Event Registration{/if} - {contact.display_name}

diff --git a/xml/templates/message_templates/membership_autorenew_billing_subject.tpl b/xml/templates/message_templates/membership_autorenew_billing_subject.tpl
index c03dab7845b900c143b3fea50ce914490126aaec..3579f90330909beda33e7972039a2f715cd24ff6 100644 (file)
--- a/xml/templates/message_templates/membership_autorenew_billing_subject.tpl
+++ b/xml/templates/message_templates/membership_autorenew_billing_subject.tpl
@@ -1 +1 @@
-{ts}Membership Autorenewal Billing Updates{/ts}
\ No newline at end of file
+{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/membership_autorenew_cancelled_subject.tpl b/xml/templates/message_templates/membership_autorenew_cancelled_subject.tpl
index ccfb0de98f69c1f31177bcbd9210d18d0bdd9204..69c2ab8a3c1e6457bec99cab9bfe6a998815c164 100644 (file)
--- a/xml/templates/message_templates/membership_autorenew_cancelled_subject.tpl
+++ b/xml/templates/message_templates/membership_autorenew_cancelled_subject.tpl
@@ -1 +1 @@
-{ts}Autorenew Membership Cancellation Notification{/ts}
+{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/membership_offline_receipt_subject.tpl b/xml/templates/message_templates/membership_offline_receipt_subject.tpl
index ccc8b3cfa6a0451ed145ea4e1b885b319d051da0..abc79f7c557969601f7e52522d67b260477ee48e 100644 (file)
--- a/xml/templates/message_templates/membership_offline_receipt_subject.tpl
+++ b/xml/templates/message_templates/membership_offline_receipt_subject.tpl
@@ -2,4 +2,4 @@
 {ts}Membership Confirmation and Receipt{/ts}
 {elseif $receiptType EQ 'membership renewal'}
 {ts}Membership Renewal Confirmation and Receipt{/ts}
-{/if}
+{/if} - {contact.display_name}

diff --git a/xml/templates/message_templates/membership_online_receipt_subject.tpl b/xml/templates/message_templates/membership_online_receipt_subject.tpl
index 32d4e402a82c44f576f5ec568449ab695210618c..052dce5bd7487c768fb4a07181a4872ca60c9ca5 100644 (file)
--- a/xml/templates/message_templates/membership_online_receipt_subject.tpl
+++ b/xml/templates/message_templates/membership_online_receipt_subject.tpl
@@ -1 +1 @@
-{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title}
+{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}

diff --git a/xml/templates/message_templates/participant_cancelled_subject.tpl b/xml/templates/message_templates/participant_cancelled_subject.tpl
index e45a6be64c9f09896c759b2f617809a5fc0aae71..e3974098392273bdcd7c3f072574d6f11c9c498c 100644 (file)
--- a/xml/templates/message_templates/participant_cancelled_subject.tpl
+++ b/xml/templates/message_templates/participant_cancelled_subject.tpl
@@ -1 +1 @@
-{ts 1=$event.event_title}Event Registration Cancelled for %1{/ts}
+{ts 1=$event.event_title}Event Registration Cancelled for %1{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/participant_confirm_subject.tpl b/xml/templates/message_templates/participant_confirm_subject.tpl
index 2f3b9479727e1eaece376473002952f570156b90..5bac86835b0ef8f6fc9ff89c2e1ea5f6d5c87966 100644 (file)
--- a/xml/templates/message_templates/participant_confirm_subject.tpl
+++ b/xml/templates/message_templates/participant_confirm_subject.tpl
@@ -1 +1 @@
-{ts 1=$event.event_title}Confirm your registration for %1{/ts}
+{ts 1=$event.event_title}Confirm your registration for %1{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/participant_expired_subject.tpl b/xml/templates/message_templates/participant_expired_subject.tpl
index aeb56d320432a018e475699b3e12fbb06015359e..a62fd9e566970b196bbf7bed2d00ba08851d0f11 100644 (file)
--- a/xml/templates/message_templates/participant_expired_subject.tpl
+++ b/xml/templates/message_templates/participant_expired_subject.tpl
@@ -1 +1 @@
-{ts 1=$event.event_title}Event registration has expired for %1{/ts}
+{ts 1=$event.event_title}Event registration has expired for %1{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/participant_transferred_subject.tpl b/xml/templates/message_templates/participant_transferred_subject.tpl
index 6488ece90baedcaeb0fc5b290b13ec07b082085c..2e2bf244d575583b78883e9c29ed5d17e8a2068f 100644 (file)
--- a/xml/templates/message_templates/participant_transferred_subject.tpl
+++ b/xml/templates/message_templates/participant_transferred_subject.tpl
@@ -1 +1 @@
-{ts 1=$event.event_title}Event Registration Transferred for %1{/ts}
+{ts 1=$event.event_title}Event Registration Transferred for %1{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/payment_or_refund_notification_subject.tpl b/xml/templates/message_templates/payment_or_refund_notification_subject.tpl
index ef17a4ce556b9213bc9a51975f313dbf192da59c..7fc6a6b084dd4721e255102ff6e17de10bf434d4 100644 (file)
--- a/xml/templates/message_templates/payment_or_refund_notification_subject.tpl
+++ b/xml/templates/message_templates/payment_or_refund_notification_subject.tpl
@@ -1 +1 @@
-{if $isRefund}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if} - {if $component eq 'event'}{$event.title}{/if}
\ No newline at end of file
+{if $isRefund}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if}{if $component eq 'event'} - {$event.title}{/if} - {contact.display_name}

diff --git a/xml/templates/message_templates/pcp_notify_subject.tpl b/xml/templates/message_templates/pcp_notify_subject.tpl
index d75d4601d040184768d7abec5b172df6477650d2..a42b381f8a5055d357ae46cbd737e7a573543ddd 100644 (file)
--- a/xml/templates/message_templates/pcp_notify_subject.tpl
+++ b/xml/templates/message_templates/pcp_notify_subject.tpl
@@ -1 +1 @@
-{ts}Personal Campaign Page Notification{/ts}
+{ts}Personal Campaign Page Notification{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/pcp_owner_notify_subject.tpl b/xml/templates/message_templates/pcp_owner_notify_subject.tpl
index 83d9e8f933132915c003536ab7cba562a0f9d5d5..95e8d9789d8019d45fa97abfa033ef9a059e6855 100644 (file)
--- a/xml/templates/message_templates/pcp_owner_notify_subject.tpl
+++ b/xml/templates/message_templates/pcp_owner_notify_subject.tpl
@@ -1 +1 @@
-{ts}Someone has just donated to your personal campaign page{/ts}
+{ts}Someone has just donated to your personal campaign page{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/pcp_status_change_subject.tpl b/xml/templates/message_templates/pcp_status_change_subject.tpl
index dc5bc5ee1f58508905149cb9987a8d3af0f15405..be7baecc723f8f9f2c9baa472e9e9ffbded8d32e 100644 (file)
--- a/xml/templates/message_templates/pcp_status_change_subject.tpl
+++ b/xml/templates/message_templates/pcp_status_change_subject.tpl
@@ -1 +1 @@
-{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts}
+{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/pcp_supporter_notify_subject.tpl b/xml/templates/message_templates/pcp_supporter_notify_subject.tpl
index dc5bc5ee1f58508905149cb9987a8d3af0f15405..be7baecc723f8f9f2c9baa472e9e9ffbded8d32e 100644 (file)
--- a/xml/templates/message_templates/pcp_supporter_notify_subject.tpl
+++ b/xml/templates/message_templates/pcp_supporter_notify_subject.tpl
@@ -1 +1 @@
-{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts}
+{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/petition_confirmation_needed_subject.tpl b/xml/templates/message_templates/petition_confirmation_needed_subject.tpl
index 8f86ab9231a66c36dbb74b97d42713b77aaaf9b2..2d39e4c4dcf28678897286f73e64ab636b40447b 100644 (file)
--- a/xml/templates/message_templates/petition_confirmation_needed_subject.tpl
+++ b/xml/templates/message_templates/petition_confirmation_needed_subject.tpl
@@ -1 +1 @@
-Confirmation of signature needed for {$petition.title}
+Confirmation of signature needed for {$petition.title} - {contact.display_name}

diff --git a/xml/templates/message_templates/petition_sign_subject.tpl b/xml/templates/message_templates/petition_sign_subject.tpl
index 49edf1e89b5ae36fe86d72a3c25163e21c95ada9..cbf65b26a3e247fee12f034655796e9c6c236875 100644 (file)
--- a/xml/templates/message_templates/petition_sign_subject.tpl
+++ b/xml/templates/message_templates/petition_sign_subject.tpl
@@ -1 +1 @@
-Thank you for signing {$petition.title}
\ No newline at end of file
+Thank you for signing {$petition.title} - {contact.display_name}

diff --git a/xml/templates/message_templates/pledge_acknowledge_subject.tpl b/xml/templates/message_templates/pledge_acknowledge_subject.tpl
index ce0c9928599db9de50f3a19a4c37ef58bf6538aa..c00efef5f227599e2df055f9680bb3656a6a7c51 100644 (file)
--- a/xml/templates/message_templates/pledge_acknowledge_subject.tpl
+++ b/xml/templates/message_templates/pledge_acknowledge_subject.tpl
@@ -1 +1 @@
-{ts}Thank you for this pledge{/ts}
+{ts}Thank you for your Pledge{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/pledge_reminder_subject.tpl b/xml/templates/message_templates/pledge_reminder_subject.tpl
index 9e06198c3481c2e425f3d51cafcf5efd0834c0ee..1d3b010781ba55906bfb32f7626fa12b642f80c3 100644 (file)
--- a/xml/templates/message_templates/pledge_reminder_subject.tpl
+++ b/xml/templates/message_templates/pledge_reminder_subject.tpl
@@ -1 +1 @@
-{ts}Pledge Payment Reminder{/ts}
+{ts}Pledge Payment Reminder{/ts} - {contact.display_name}

diff --git a/xml/templates/message_templates/uf_notify_subject.tpl b/xml/templates/message_templates/uf_notify_subject.tpl
index 0da62f65d25afd8e70beb0cc7f4bd3525c7e2434..0fd90f776aa041d4c39e5ec30a973cc2775719d9 100644 (file)
--- a/xml/templates/message_templates/uf_notify_subject.tpl
+++ b/xml/templates/message_templates/uf_notify_subject.tpl
@@ -1 +1 @@
-{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts}
+{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts} - {contact.display_name}