-
-
Notifications
You must be signed in to change notification settings - Fork 827
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
dev/core#781 Additional email greetings in message templates #15491
dev/core#781 Additional email greetings in message templates #15491
Conversation
(Standard links)
|
9565e25
to
793445c
Compare
@magnolia61 in the case of the 2 test failures the tests need to be updated to check for the right string now that that has changed |
bdf41c8
to
c00176a
Compare
test this please |
@magnolia61 ug - I merged in a related PR & now this won't apply - can you |
7a15768
to
ef2fb37
Compare
23f32ee
to
d0dc141
Compare
looks like a smarty error has snuck in api_v3_PaymentTest::testRefundEmailReceipt with data set #0 ('.') |
7fa9f46
to
9bbe2e2
Compare
@magnolia61 still failing :-( |
eddc602
to
a45b031
Compare
@eileenmcnaughton not sure why the test fails. think all is ok now. |
@magnolia61 arg - it needs a rebase :-( |
fd5576b
to
6c14919
Compare
CRM/Event/BAO/Event.php
Outdated
@@ -1172,6 +1172,7 @@ public static function sendMail($contactID, $values, $participantId, $isTest = F | |||
'customPost' => $profilePost[0], | |||
'customPost_grouptitle' => $customPostTitles, | |||
'participantID' => $participantId, | |||
'contactID' => $contactID, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ug you have pulled in some unrelated stuff
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
test all passed now. Are you able to merge this?
db3e7cb
to
c6b4dac
Compare
c6b4dac
to
5665806
Compare
Yes - I think we are there - good to see so many test changes needed - shows test coverage |
Overview
For many standard workflow message templates the greeting was already changed to {contact.email_greeting}. This PR fixes the remaining templates.
Before
Not all standard workflow message templates were using {contact.email_greeting}
After
All standard workflow message templates are using {contact.email_greeting}
Technical Details
Additionally in the participant_confirm template a missing {ts}{/ts} was fixed for the confirmation Url.
This PR also serves as the upgrader script for the following other PR's in 5.20alpha1:
#15503 ( Update 'Thank You' & other corrections) (https://lab.civicrm.org/dev/core/issues/1316)
#15467 (Remove template refs to 'print for your records' (https://lab.civicrm.org/dev/core/issues/371)
#15513 (include displayname in subject) https://lab.civicrm.org/dev/core/issues/1320