Reconcile contribution amount tokens #21036
Merged
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
commented
Aug 6, 2021
| */ | ||
| public function evaluateToken(TokenRow $row, $entity, $field, $prefetch = NULL) { | ||
| $actionSearchResult = $row->context['actionSearchResult']; | ||
| $fieldValue = $actionSearchResult->{"contrib_$field"} ?? NULL; | ||
|
|
||
| if (in_array($field, ['total_amount', 'fee_amount', 'net_amount'])) { | ||
| if (array_key_exists($field, $this->getPseudoTokens())) { |
There was a problem hiding this comment.
This is just moved higher to process it first since there is no metadata for these tokens & it will enotice
There was a problem hiding this comment.
- note I will switch in a follow up to having an isPseudoToken function
eileenmcnaughton
force-pushed
the
act_mon
branch
2 times, most recently
from
b13db4a to
6519150
Compare
|
Follow up switch to use apiv4 metadata #21038 |
|
@eileenmcnaughton this is conflicted now but it does match what I was expecting |
eileenmcnaughton
force-pushed
the
act_mon
branch
from
6519150 to
646bf77
Compare
|
@seamuslee001 rebased |
This adds non_deductible_amount, as identified in civicrm#21034 It also moves the metadata functions to a parent class - this class might wind up being a temporary class as there are 3 other contenders for where this functionality should go - the TokenTrait, the abstractProvider or the tokenRow class. The intent is not to make that decision yet - just to provide visual clarity about what is generic Note - I've figured out how to switch over to v4 api for this but will do that in a separate PR
eileenmcnaughton
force-pushed
the
act_mon
branch
from
646bf77 to
17b6f17
Compare
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
Reconcile contribution amount tokens
Before
non_deductible_amount identified in #21034 as being present in the legacy token provider but not the token processor / scheduled reminders
After
Rendered & tested in both
Technical Details
PR also moves the metadata functions to a parent class - this class might wind up
being a temporary class as there are 3 other contenders for where this functionality
should go - the TokenTrait, the abstractProvider or the tokenRow class. The intent
is not to make that decision yet - just to provide visual clarity about
what is generic
Note - I've figured out how to switch over to v4 api for this but will do that in a separate PR
Comments