Skip to content
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.

Sign up for GitHub

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

Jump to bottom

dev/core#781 Additional email greetings in message templates #15491

Merged
merged 1 commit into from
Oct 18, 2019
Merged

dev/core#781 Additional email greetings in message templates #15491

merged 1 commit into from
Oct 18, 2019

Conversation

magnolia61
Copy link
Contributor

@magnolia61 magnolia61 commented Oct 13, 2019 •
edited
Loading

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

@civibot
Copy link

civibot bot commented Oct 13, 2019

(Standard links)

@civibot civibot bot added the master label Oct 13, 2019
@magnolia61 magnolia61 force-pushed the Additional_Email_Greetings_in_workflow_message_templates branch 4 times, most recently from 9565e25 to 793445c Compare October 13, 2019 14:23
@eileenmcnaughton
Copy link
Contributor

@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

@magnolia61 magnolia61 force-pushed the Additional_Email_Greetings_in_workflow_message_templates branch 4 times, most recently from bdf41c8 to c00176a Compare October 13, 2019 20:50
@eileenmcnaughton
Copy link
Contributor

test this please

@eileenmcnaughton
Copy link
Contributor

@magnolia61 ug - I merged in a related PR & now this won't apply - can you git pull --rebase & git push -f?

@magnolia61 magnolia61 force-pushed the Additional_Email_Greetings_in_workflow_message_templates branch 5 times, most recently from 7a15768 to ef2fb37 Compare October 14, 2019 08:59
@magnolia61 magnolia61 changed the title Additional email greetings in workflow message templates Additional email greetings in message templates Oct 14, 2019
@magnolia61 magnolia61 mentioned this pull request Oct 14, 2019
Merged
@magnolia61 magnolia61 force-pushed the Additional_Email_Greetings_in_workflow_message_templates branch 2 times, most recently from 23f32ee to d0dc141 Compare October 14, 2019 14:36
@eileenmcnaughton
Copy link
Contributor

looks like a smarty error has snuck in

api_v3_PaymentTest::testRefundEmailReceipt with data set #0 ('.')
Failure in api call for Payment sendconfirmation: Smarty error: [in string:{assign var="greeting" value="Dear Anthony"}{if $greeting}{$greeting},{/if}

@magnolia61 magnolia61 force-pushed the Additional_Email_Greetings_in_workflow_message_templates branch 4 times, most recently from 7fa9f46 to 9bbe2e2 Compare October 14, 2019 19:49
@eileenmcnaughton eileenmcnaughton changed the title Additional email greetings in message templates dev/core#781 Additional email greetings in message templates Oct 14, 2019
@eileenmcnaughton
Copy link
Contributor

@magnolia61 still failing :-(

@magnolia61 magnolia61 reopened this Oct 17, 2019
@magnolia61 magnolia61 force-pushed the Additional_Email_Greetings_in_workflow_message_templates branch 12 times, most recently from eddc602 to a45b031 Compare October 17, 2019 12:18
@magnolia61
Copy link
Contributor Author

magnolia61 commented Oct 17, 2019 •
edited
Loading

@eileenmcnaughton not sure why the test fails. think all is ok now.

@eileenmcnaughton
Copy link
Contributor

@magnolia61 arg - it needs a rebase :-(

@magnolia61 magnolia61 force-pushed the Additional_Email_Greetings_in_workflow_message_templates branch 4 times, most recently from fd5576b to 6c14919 Compare October 18, 2019 07:18
eileenmcnaughton
eileenmcnaughton reviewed Oct 18, 2019
View reviewed changes
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,
Copy link
Contributor

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

Copy link
Contributor Author

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?

@magnolia61 magnolia61 force-pushed the Additional_Email_Greetings_in_workflow_message_templates branch 6 times, most recently from db3e7cb to c6b4dac Compare October 18, 2019 07:50
@magnolia61 magnolia61 force-pushed the Additional_Email_Greetings_in_workflow_message_templates branch from c6b4dac to 5665806 Compare October 18, 2019 07:53
@eileenmcnaughton
Copy link
Contributor

Yes - I think we are there - good to see so many test changes needed - shows test coverage

@eileenmcnaughton eileenmcnaughton merged commit c9496bc into civicrm:master Oct 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eileenmcnaughton eileenmcnaughton eileenmcnaughton left review comments

Assignees
No one assigned
Labels
has-test master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@magnolia61 @eileenmcnaughton @agh1