dev/core#4123 Support contribution recur tokens when accessing from a… #25563
Conversation
|
No issue was found matching the number given in the pull request title. Please check the issue number. |
|
(Standard links)
|
|
@seamuslee001 tests aside this addresses my concerns on the other PR. Stylistically though I'd like to converge on something like civicrm-core/CRM/Contact/Tokens.php Line 188 in 77800af The thinking is
|
|
Test fail looks to be permissions ? api_v3_PaymentTest::testMultiplePaymentsForContribution We do have a placeholder property for |
seamuslee001
force-pushed
the
dev_core_4123
branch
from
2a2d9ba to
3fd8ce3
Compare
|
ok @eileenmcnaughton I have updated that now and I think I have fixed the test failures |
seamuslee001
force-pushed
the
dev_core_4123
branch
from
3fd8ce3 to
cdad226
Compare
|
@seamuslee001 not quite - also I think you should unadvertise a bunch of tokens - ie the 'Transaction ID' from the recur is ambiguous - best to change the audience on the ones that could be confusing I think. CRM_Contribute_ActionMapping_ByTypeTest::testTokenRendering |
… contribution or membership Use getRelatedTokens function name instead and also fix tests Hide some unnecessary tokens and fix tests
seamuslee001
force-pushed
the
dev_core_4123
branch
from
cdad226 to
f030a44
Compare
|
@eileenmcnaughton I think I have hidden the relevant ones now can you take another look at this? |
| */ | ||
| protected function getRelatedTokens(): array { | ||
| $tokens = []; | ||
| $hiddenTokens = ['modified_date', 'create_date', 'trxn_id', 'invoice_id', 'is_test', 'payment_token_id', 'payment_processor_id', 'payment_instrument_id', 'cycle_day', 'installments', 'processor_id', 'next_sched_contribution_date', 'failure_count', 'failure_retry_date', 'auto_renew', 'is_email_receipt', 'contribution_status_id']; |
There was a problem hiding this comment.
I wonder about next_sched_contribution_date - that feels like something people might use - but non-blocking
| 'type' => 'mapped', | ||
| 'options' => $contributionRecurField['options'] ?? NULL, | ||
| 'data_type' => $contributionRecurField['data_type'], | ||
| 'audience' => in_array($contributionRecurField['name'], $hiddenTokens) ? 'hidden' : 'user', |
There was a problem hiding this comment.
ideally in_array would have the final TRUE for strict mode. Non blocking
|
OK - let's merge this - I think it might get a bit confusing when both recurring and membership tokens are available - probably only scheduled reminders. But that is probably not going to be a major concern for anyone & we can think of ways to address if it bubbles up |
… contribution or membership
Overview
This is an alterative to #22450 and picks up Eileen's comment on that PR to add support for using
{contribution.contribution_recur_id.x}or{membership.contribution_recur_id.x}tokensBefore
Cannot access Contribution Recur Related fields from contribution or membership records in token process
After
Can do so
ping @eileenmcnaughton @mattwire @JoeMurray