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.

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

[REF] Permit domain tokens being used within Thank You letters #17230

Merged

Conversation

seamuslee001
Copy link
Contributor

Overview

Contribution Thank you letters do not output domain tokens e.g. {domain.name}

Before

Domain tokens are not outputted in Contribution Thank you letters

After

Domain tokens are replaced in Contribution Thank You letters

ping @mattwire @eileenmcnaughton @monishdeb

@civibot
Copy link

civibot bot commented May 5, 2020

(Standard links)

@civibot civibot bot added the master label May 5, 2020
@monishdeb
Copy link
Member

Changes looks good to me.

  • General standards
  • Developer standards
    • Technical impact (r-tech) PASS
    • Code quality (r-code)
      • PASS
      • PASS: The test results are all-clear.

Copy link
Contributor

@mattwire mattwire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@seamuslee001 Just one request to move a line of code and then this is good to merge.

Comment on lines 231 to 232
$domain = CRM_Core_BAO_Domain::getDomain();
$tokenHtml = CRM_Utils_Token::replaceDomainTokens($tokenHtml, $domain, TRUE, $messageToken);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@seamuslee001 Can you put this above replaceContactTokens() - we found a scenario with the mailings recently when for some reason replaceContactTokens() stripped the domain tokens and they didn't get set.

@seamuslee001 seamuslee001 force-pushed the domain_token_thank_you_letter branch from ce6123b to cb9b864 Compare May 5, 2020 10:14
@seamuslee001
Copy link
Contributor Author

@mattwire done now

@monishdeb
Copy link
Member

Merging as per MOP tag.

@monishdeb monishdeb merged commit 778d19f into civicrm:master May 5, 2020
@seamuslee001 seamuslee001 deleted the domain_token_thank_you_letter branch May 5, 2020 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants