dev/core#2344 unit test for fix regression affecting sending thank you letters when grouped #19481
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
eileenmcnaughton
changed the title
eileenmcnaughton
commented
Feb 1, 2021
| @@ -336,7 +339,7 @@ public static function combineContributions($existing, $contribution, $separator | |||
| public static function assignCombinedContributionValues($contact, $contributions, $groupBy, $groupByID) { | |||
| CRM_Core_Smarty::singleton()->assign('contact_aggregate', $contact['contact_aggregate']); | |||
| CRM_Core_Smarty::singleton() | |||
| ->assign('contributions', array_intersect_key($contributions, $contact['contribution_ids'][$groupBy][$groupByID])); | |||
There was a problem hiding this comment.
contributions is now passed in pre-filtered
eileenmcnaughton
commented
Feb 1, 2021
| $categories = self::getTokenCategories(); | ||
| $domain = CRM_Core_BAO_Domain::getDomain(); | ||
| $tokenHtml = CRM_Utils_Token::replaceDomainTokens($html_message, $domain, TRUE, $messageToken); | ||
| $tokenHtml = CRM_Utils_Token::replaceContactTokens($tokenHtml, $contact, TRUE, $messageToken); | ||
| if ($grouped) { | ||
| $tokenHtml = CRM_Utils_Token::replaceMultipleContributionTokens($separator, $tokenHtml, $contribution, TRUE, $messageToken); |
There was a problem hiding this comment.
The 'TRUE' is eventually ignored so not needed as a param
eileenmcnaughton
force-pushed
the
pdffix
branch
3 times, most recently
from
c559413 to
f54788f
Compare
eileenmcnaughton
force-pushed
the
pdffix
branch
2 times, most recently
from
8d8a30d to
ec6e4b4
Compare
eileenmcnaughton
force-pushed
the
pdffix
branch
from
ec6e4b4 to
4002221
Compare
eileenmcnaughton
changed the title
|
Jenkins re test this please |
|
Still the sql gone away fails :-( |
|
Jenkins re test this please |
|
Test fails unrelated |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
dev/core#2344 fix regression affecting sending thank you letters when grouped
Before
After
PDF rendered, added test passes
Technical Details
The regression was caused by #18714 - however, the fix makes the approach less flakey,.
replaceMultipleContributionTokens(only called from one place) was passing in an array where the tokens were already concatenated & expecting thereplaceContributionTokensto swap them out as is.The new approach uses replaceContributionTokens to do the replacing on each contribution (one at a time) and then concatenates the resolved tokens, before using a different function
token_replaceto do the actual replacements.Although this code is a bit hardwork it is mostly not called from other places
Comments
https://lab.civicrm.org/dev/core/-/issues/2344