CRM-21264 - Fix tabular formatting of contributions in merged letters grouped by contact #11820
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
Test currently fails on "simplest TRUE" case added, which demonstrates the bug described in CRM-21264. Also added other test cases which current fail as well.
* Improve docblock * Get rid of "dontCare" since that argument is optional as of PHP 5.4 http://php.net/manual/en/function.preg-match-all.php#refsect1-function.preg-match-all-changelog * Move regex to its own line to improve readability
* Escape dot in token since it will be used in a regex (for good measure) * Add `(?![\w-])` to ensure that `td` is not followed by other characters that would make it a different element. * Instead of the first `.+?`, use `((?!</td>).)*` which matches zero or more characters but refuses to consume if it encounters `</td>` * Escape curly braces (for good measure) * Instead of the second `.+?`, use `.*?` so that it will match if there are zero characters. (Note: this change is really the crux of the issue, as described in CRM-21264). * Complete then closing `</td>` (for good measure)
I replicated this & agree this fixes it. I didn't fully work through the regex because I was happy with the UI results & the unit test. This PR is multiple commits but each commit stands alone as a discrete change & is clearly explained in the commit message |
|
Nice work @seanmadsen - up to your usual high standard of explanation & documentation! |
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
This change makes it easier for users to generate PDF thank-you letters for contributions that are grouped by contact with details of multiple contributions in one page, displayed in table cells
Before
PDFs generated with these repro steps didn't display contribution fields within table cells.
After
The table cells in the PDF display as expected.
Technical Details
Comments