Seamus Lee [Fri, 1 Oct 2021 07:23:09 +0000 (17:23 +1000)]
Merge pull request #21685 from eileenmcnaughton/email
Remove unused paramter
Eileen McNaughton [Fri, 1 Oct 2021 04:05:59 +0000 (17:05 +1300)]
Remove unused paramter
Eileen McNaughton [Fri, 1 Oct 2021 04:03:21 +0000 (17:03 +1300)]
Merge pull request #21671 from eileenmcnaughton/wf_name
Remove workflow_id reference
Eileen McNaughton [Fri, 1 Oct 2021 02:52:53 +0000 (15:52 +1300)]
Merge pull request #21678 from demeritcowboy/test-fileoncase
[NFC] Unit test for file-on-case
demeritcowboy [Thu, 30 Sep 2021 20:04:20 +0000 (16:04 -0400)]
test for file on case
Eileen McNaughton [Fri, 1 Oct 2021 00:15:13 +0000 (13:15 +1300)]
Merge pull request #21680 from eileenmcnaughton/gogo
Remove now-silly function
Tim Otten [Fri, 1 Oct 2021 00:02:40 +0000 (17:02 -0700)]
ang/crmMailing/Templates.js - Dropdown shouldn't show system workflow templates
These are now identified by `workflow_name` rather than `workflow_id`.
Tim Otten [Fri, 1 Oct 2021 00:01:03 +0000 (17:01 -0700)]
MessageTemplate - Fix "revert" for msgtpl's that set `workflow_name` sans `workflow_id`
Eileen McNaughton [Thu, 30 Sep 2021 23:53:43 +0000 (12:53 +1300)]
Merge pull request #21679 from Detsieber/patch-2
Update SelfSvcUpdate.php
Eileen McNaughton [Thu, 30 Sep 2021 22:22:53 +0000 (11:22 +1300)]
Remove now-silly function
Eileen McNaughton [Thu, 30 Sep 2021 22:00:18 +0000 (11:00 +1300)]
Merge pull request #21677 from eileenmcnaughton/move
Return another function to the email trait
Detlev Sieber [Thu, 30 Sep 2021 21:27:39 +0000 (23:27 +0200)]
Update SelfSvcUpdate.php
Changing this text is necessary for internationalization, because otherwise we get an ambigous translation in some languages
Eileen McNaughton [Thu, 30 Sep 2021 19:54:58 +0000 (08:54 +1300)]
Return another function to the email trait
Another function that is only used from one place & is unnecessarily complicated
because of the input & output paramters
demeritcowboy [Thu, 30 Sep 2021 12:43:48 +0000 (08:43 -0400)]
Merge pull request #21648 from eileenmcnaughton/email_task
[REF] Copy another email trait function back to the trait
Eileen McNaughton [Wed, 29 Sep 2021 23:09:06 +0000 (12:09 +1300)]
Remove workflow_id reference
demeritcowboy [Thu, 30 Sep 2021 01:15:44 +0000 (21:15 -0400)]
Merge pull request #21472 from mattwire/contributionrecurmodifieddate
ContributionRecur modified_date should update to current_timestamp on update
demeritcowboy [Thu, 30 Sep 2021 01:15:30 +0000 (21:15 -0400)]
Merge pull request #21403 from GValFr35/fix-session-reference-5.40
(dev/drupal#163) Session erroneously getting set to NULL on change
Eileen McNaughton [Thu, 30 Sep 2021 00:22:41 +0000 (13:22 +1300)]
Merge pull request #21670 from eileenmcnaughton/dist
Add message admin to dist
Eileen McNaughton [Wed, 29 Sep 2021 22:49:52 +0000 (11:49 +1300)]
Add message admin to dist
Eileen McNaughton [Wed, 29 Sep 2021 22:42:51 +0000 (11:42 +1300)]
Merge pull request #21633 from eileenmcnaughton/notices_s
Fix header e-notices
Eileen McNaughton [Wed, 29 Sep 2021 22:06:10 +0000 (11:06 +1300)]
Merge pull request #21590 from totten/master-msgtplui
dev/mail#83 - Import current revision of "Message Admin"
colemanw [Wed, 29 Sep 2021 20:55:08 +0000 (16:55 -0400)]
Merge pull request #21637 from eileenmcnaughton/cont_test
Tests - update to use postProcess
demeritcowboy [Wed, 29 Sep 2021 20:32:23 +0000 (16:32 -0400)]
Merge pull request #21455 from jaapjansma/issue_645
Fixed issue with sending from do-not-reply@domain address
colemanw [Wed, 29 Sep 2021 14:26:12 +0000 (10:26 -0400)]
Merge pull request #21661 from eileenmcnaughton/cleanup
Basic IDE cleanup on test class
Matthew Wire [Tue, 14 Sep 2021 15:22:11 +0000 (16:22 +0100)]
ContributionRecur modified_date should update to current_timestamp on update
Eileen McNaughton [Wed, 29 Sep 2021 11:34:28 +0000 (00:34 +1300)]
Merge pull request #21613 from eileenmcnaughton/update_from
Simplify getRecurFromAddress
Eileen McNaughton [Wed, 29 Sep 2021 11:21:05 +0000 (00:21 +1300)]
Merge pull request #21665 from civicrm/5.42
5.42 to master
Eileen McNaughton [Wed, 29 Sep 2021 11:20:39 +0000 (00:20 +1300)]
Merge pull request #21664 from jitendrapurohit/end_event-542
Fix missing value of End Adjustment column from Membership status page
Eileen McNaughton [Wed, 29 Sep 2021 11:19:48 +0000 (00:19 +1300)]
Merge pull request #21662 from eileenmcnaughton/mem
Test fix
jitendrapurohit [Wed, 29 Sep 2021 08:50:10 +0000 (14:20 +0530)]
fix end_event_adjust key
Eileen McNaughton [Wed, 29 Sep 2021 07:55:52 +0000 (20:55 +1300)]
Test fix
Eileen McNaughton [Wed, 29 Sep 2021 07:40:42 +0000 (20:40 +1300)]
Basic IDE cleanup on test class
Eileen McNaughton [Sun, 26 Sep 2021 22:21:42 +0000 (11:21 +1300)]
Fix header e-notices
This should solve enotices across a bunch of screens
Eileen McNaughton [Sat, 25 Sep 2021 05:37:31 +0000 (17:37 +1200)]
Simplify getRecurFromAddress
This switches to use the code extracted from the other function
Eileen McNaughton [Wed, 29 Sep 2021 04:03:57 +0000 (17:03 +1300)]
Merge pull request #21652 from eileenmcnaughton/cont_render_more
Remove call to the dreaded replaceMultipleContributionTokens
Monish Deb [Wed, 29 Sep 2021 03:44:01 +0000 (09:14 +0530)]
Merge pull request #21521 from eileenmcnaughton/member_tokens
dev/core#2832 Switch membership pdf to use token processor
demeritcowboy [Wed, 29 Sep 2021 02:25:30 +0000 (22:25 -0400)]
Merge pull request #21658 from eileenmcnaughton/enotice
Enotice fix
demeritcowboy [Wed, 29 Sep 2021 02:25:09 +0000 (22:25 -0400)]
Merge pull request #21659 from eileenmcnaughton/notice2
Enotice fixes
demeritcowboy [Wed, 29 Sep 2021 02:16:16 +0000 (22:16 -0400)]
Merge pull request #21595 from agileware/CIVICRM-1563
Find Activities Search, the default search option of "With" criteria excludes Activities by default. Confuses End Users when 0 results are returned when criteria appears to be correct.
demeritcowboy [Wed, 29 Sep 2021 02:14:55 +0000 (22:14 -0400)]
Merge pull request #21562 from jitendrapurohit/notify-user
Do not send email notification to the user if `notify` is not set in the params
Eileen McNaughton [Tue, 28 Sep 2021 07:17:57 +0000 (20:17 +1300)]
Remove call to the dreaded replaceMultipleContributionTokens
Eileen McNaughton [Sat, 18 Sep 2021 01:00:22 +0000 (13:00 +1200)]
Remove calls to replaceContributionTokens
Eileen McNaughton [Wed, 29 Sep 2021 01:44:09 +0000 (14:44 +1300)]
Merge pull request #21657 from totten/master-wfvn
MessageTemplate - Deprecate `valueName`. Emphasize `workflow`. Consolidate converters.
Eileen McNaughton [Wed, 29 Sep 2021 00:36:12 +0000 (13:36 +1300)]
Enotice fixes
Eileen McNaughton [Wed, 29 Sep 2021 00:30:33 +0000 (13:30 +1300)]
Enotice fix
Eileen McNaughton [Tue, 28 Sep 2021 23:10:20 +0000 (12:10 +1300)]
Merge pull request #21656 from eileenmcnaughton/role
Fix label for participant role
Eileen McNaughton [Tue, 28 Sep 2021 22:45:30 +0000 (11:45 +1300)]
Merge pull request #21587 from eileenmcnaughton/badge_ev
dev/core#2834 Use event tokens for participant badges
Tim Otten [Tue, 28 Sep 2021 22:05:30 +0000 (15:05 -0700)]
(REF) WorkflowMessage - Emphasize the newer 'workflow' instead of 'valueName'
Tim Otten [Tue, 28 Sep 2021 22:01:11 +0000 (15:01 -0700)]
MessageTemplate - Allow 'workflow'/'valueName' as aliases. Consolidate alias bits.
The params given to `MessageTemplate::sendTemplate()` are evolving. But they are also
exposed via hook. Blerg.
This technically does two things:
1. It takes a couple of bits which are responsible for aliasing/transitioning specific
params, and it moves them to a common `$sync()` function.
2. It deprecates `valueName` in favor of `workflow`, and it updates the hook test
accordingly.
Tim Otten [Tue, 28 Sep 2021 06:06:32 +0000 (23:06 -0700)]
(REF) ExampleWorkflowTest - Add coverage for alterMailParams($params['valueName'])
Tim Otten [Tue, 28 Sep 2021 21:55:44 +0000 (14:55 -0700)]
(REF) hook_civicrm_alterMailParams.evch.php - Soften 'type' check
This changes some of the plumbing in how it interprets 'paramSpecs' - but
doesn't change anything substantive.
Before: You must specify a 'type' constraint for every param.
After: You may omit the 'type' constraint for some params.
Before: If you specify a nullable string with a regex, then null-values will fail.
After: If you specify a nullable string with a regex, then null-values will pass.
Tim Otten [Tue, 28 Sep 2021 21:32:39 +0000 (14:32 -0700)]
(REF) CRM_Utils_Array - Add pathSync() helper
Eileen McNaughton [Tue, 28 Sep 2021 21:20:01 +0000 (10:20 +1300)]
Fix label for participant role
Eileen McNaughton [Thu, 23 Sep 2021 09:55:20 +0000 (21:55 +1200)]
dev/core#2834 Use event tokens for participant badges
Overview
----------------------------------------
Convert the rest of event badge token replacement to use
the token processor
Before
----------------------------------------
Testing and conversion had been done for contact
and participant tokens within the event badges - but
for the event tokens tests had been added but
the conversion was pending solving date formatting
After
----------------------------------------
Event badges use the token processor for event tokens
At this point all token processing in core for
participant or event tokens is done in the token
processor & attention can switch to cleaning that up
Technical Details
----------------------------------------
The challenge switching over event tokens was that badges used
a custom date format and we needed to figure out how to support
that first.
This also standardises the event.event_id token to participant.event_id
and updates it in the db for scheduled reminders (badges were using
'event.id' format & reminders the event.event_id format).
There are still some tokens on the scheduled reminders to
standarsise and a loading challenge to fix - but this
concludes the badge portion of fixing up event tokens
Note that the tokenConsistencyTest is the main test cover
for event tokens and it turns out we are not quite there
on the dates based on https://github.com/civicrm/civicrm-core/pull/21584
Eileen McNaughton [Tue, 28 Sep 2021 20:35:40 +0000 (09:35 +1300)]
Merge pull request #21610 from eileenmcnaughton/rend
(REF) MessageTemplate - Reverse renderTemplate()<=>sendTemplate() call
Eileen McNaughton [Tue, 28 Sep 2021 19:37:22 +0000 (08:37 +1300)]
Merge pull request #21423 from demeritcowboy/dompdf-options
dev/core#2126 - Allow setting dompdf options, e.g. an external font folder
Yashodha Chaku [Tue, 28 Sep 2021 16:14:58 +0000 (21:44 +0530)]
Merge pull request #21655 from kurund/patch-3
typo fixes
colemanw [Tue, 28 Sep 2021 14:31:17 +0000 (10:31 -0400)]
Merge pull request #21653 from eileenmcnaughton/ref
[REF] stop passing form into createActivities
Kurund Jalmi [Tue, 28 Sep 2021 14:07:44 +0000 (15:07 +0100)]
typo fixes
Eileen McNaughton [Tue, 28 Sep 2021 10:39:33 +0000 (23:39 +1300)]
[REF] stop passing form into createActivities
This function is now an OO function - so we can make it protected & stop passing form in
Eileen McNaughton [Tue, 28 Sep 2021 08:19:25 +0000 (21:19 +1300)]
Merge pull request #21615 from totten/master-event-test-mail
tests/events/*.php - Enforce general compliance with hook/event signatures
Tim Otten [Tue, 28 Sep 2021 05:41:54 +0000 (22:41 -0700)]
MessageTemplate - Restore filtering of $params
The prior commit had the effect of dropping any filtering that happend on `$params`.
Eileen McNaughton [Tue, 28 Sep 2021 07:52:28 +0000 (20:52 +1300)]
Merge pull request #21651 from eileenmcnaughton/tpl
Set default for civicrm_message_template.is_reserved
Eileen McNaughton [Sat, 25 Sep 2021 00:32:30 +0000 (12:32 +1200)]
Reverse Render->send to Sent->render
We have a gazillion tests on this code ...
Tim Otten [Tue, 28 Sep 2021 04:58:55 +0000 (21:58 -0700)]
Merge pull request #21640 from eileenmcnaughton/edge
dev/core#2870 Fix upgrade error with rpow installed
Eileen McNaughton [Tue, 28 Sep 2021 04:42:51 +0000 (17:42 +1300)]
Merge pull request #21647 from colemanw/coalesce
APIv4 - Automatically coalesce potentially null field values in equations
Tim Otten [Tue, 28 Sep 2021 04:41:51 +0000 (21:41 -0700)]
Merge pull request #21584 from eileenmcnaughton/new_date
Extend token date handling to 'most' date fields
Seamus Lee [Tue, 28 Sep 2021 04:36:13 +0000 (14:36 +1000)]
Merge pull request #21261 from totten/master-test-jwt
HttpTestTrait - Allow one to easily authenticate subrequests
Eileen McNaughton [Tue, 28 Sep 2021 04:08:41 +0000 (17:08 +1300)]
Set default for civicrm_message_template.is_reserved
Coleman Watts [Mon, 27 Sep 2021 19:21:45 +0000 (15:21 -0400)]
APIv4 - Automatically coalesce potentially null field values in equations
Eileen McNaughton [Mon, 27 Sep 2021 23:36:33 +0000 (12:36 +1300)]
Merge pull request #21650 from demeritcowboy/fileoncase
Fix extra apostrophe added in 21636
Eileen McNaughton [Mon, 27 Sep 2021 23:35:58 +0000 (12:35 +1300)]
Merge pull request #21649 from eileenmcnaughton/sub
Test regression fix
Eileen McNaughton [Mon, 27 Sep 2021 22:36:49 +0000 (11:36 +1300)]
Merge pull request #21433 from jmcclelland/import-preferred-communication-method
avoid back trace when importing preferred communication method
Eileen McNaughton [Mon, 27 Sep 2021 21:41:06 +0000 (10:41 +1300)]
Merge pull request #21643 from colemanw/afformUrlArgs
Afform - ensure default value data type matches input type
Eileen McNaughton [Mon, 27 Sep 2021 21:21:40 +0000 (10:21 +1300)]
Test regression fix
demeritcowboy [Mon, 27 Sep 2021 21:21:39 +0000 (17:21 -0400)]
apos
Eileen McNaughton [Mon, 27 Sep 2021 21:15:16 +0000 (10:15 +1300)]
[REF] Copy another email trait function back to the trait
The only core use for this function is via the task & the signature is cludgey
This copies it back & deprecates the no-longer-in-use code
demeritcowboy [Mon, 27 Sep 2021 18:13:01 +0000 (14:13 -0400)]
Merge pull request #21636 from eileenmcnaughton/not
Enotice fix
Yashodha Chaku [Mon, 27 Sep 2021 17:36:25 +0000 (23:06 +0530)]
Merge pull request #21632 from eileenmcnaughton/notice2
Enotice fixes
demeritcowboy [Mon, 27 Sep 2021 17:30:17 +0000 (13:30 -0400)]
Merge pull request #21639 from eileenmcnaughton/nofat
enotice fixes in fatal error template
demeritcowboy [Mon, 27 Sep 2021 17:26:42 +0000 (13:26 -0400)]
Merge pull request #21623 from eileenmcnaughton/email
Remove handling for empty required field
Coleman Watts [Mon, 27 Sep 2021 16:02:59 +0000 (12:02 -0400)]
Afform - ensure default value data type matches input type
Monish Deb [Mon, 27 Sep 2021 10:33:45 +0000 (16:03 +0530)]
Merge pull request #21624 from eileenmcnaughton/no_good
dev/core#2629 show only contribution statuses on contribution form
Eileen McNaughton [Mon, 27 Sep 2021 09:06:26 +0000 (22:06 +1300)]
Merge pull request #21641 from eileenmcnaughton/contact
Remove over-copied function
Eileen McNaughton [Mon, 27 Sep 2021 06:58:29 +0000 (19:58 +1300)]
Remove over-copied function
In the splitting out of Contact_Tokens from TokenSillyAbreviationSubscriber
I copied over this function - but it was an incorrect
duplication - it is not called
Eileen McNaughton [Mon, 27 Sep 2021 06:37:07 +0000 (19:37 +1300)]
Merge pull request #21626 from eileenmcnaughton/contact
[REF] Separate contact tokens from 'tokenCompatSubscriber'
Eileen McNaughton [Mon, 27 Sep 2021 05:41:32 +0000 (18:41 +1300)]
dev/core#2870 Fix upgrade error with rpow installed
Eileen McNaughton [Mon, 27 Sep 2021 05:34:53 +0000 (18:34 +1300)]
enotice fixes in fatal error template
Eileen McNaughton [Sun, 26 Sep 2021 20:13:50 +0000 (09:13 +1300)]
[REF] Separate contact tokens from 'tokenCompatSubscriber'
This just moves code around - loads of testing - but it separates
the contact entity stuff from the 'compat' - presumably 'compatibility'
subscriber.
Eileen McNaughton [Mon, 27 Sep 2021 04:28:24 +0000 (17:28 +1300)]
Test updates to use postProcess
Eileen McNaughton [Mon, 27 Sep 2021 02:51:07 +0000 (15:51 +1300)]
Merge pull request #21606 from colemanw/afformUrlArgs
Afform - Accept default field values from the url
Eileen McNaughton [Mon, 27 Sep 2021 02:23:14 +0000 (15:23 +1300)]
Merge pull request #21635 from seamuslee001/ref_update_frequency_variables
[REF] Update Frequenecy template assignments in UpdateBilling to be c…
Eileen McNaughton [Mon, 27 Sep 2021 01:51:59 +0000 (14:51 +1300)]
Enotice fix
Eileen McNaughton [Mon, 27 Sep 2021 01:30:09 +0000 (14:30 +1300)]
Merge pull request #21634 from colemanw/api4ExplorerFix
Fix dev/core#2867 - APIv4 Entity.get to return class name by default
Eileen McNaughton [Mon, 27 Sep 2021 00:06:13 +0000 (13:06 +1300)]
Merge pull request #21631 from eileenmcnaughton/notice
enotice fix
Eileen McNaughton [Mon, 27 Sep 2021 00:04:39 +0000 (13:04 +1300)]
Merge pull request #21628 from eileenmcnaughton/test_cont
Convert more tests to call postProcess
Eileen McNaughton [Sun, 26 Sep 2021 23:53:10 +0000 (12:53 +1300)]
Merge pull request #21627 from colemanw/searchKitShoreditch
SearchKit - Style buttons for compatability with Shoreditch theme
Seamus Lee [Sun, 26 Sep 2021 23:52:14 +0000 (09:52 +1000)]
[REF] Update Frequenecy template assignments in UpdateBilling to be consistent with #21469
Seamus Lee [Sun, 26 Sep 2021 23:32:57 +0000 (09:32 +1000)]
Merge pull request #21630 from eileenmcnaughton/tte
Fix test to use postProcess
Eileen McNaughton [Sun, 26 Sep 2021 23:22:16 +0000 (12:22 +1300)]
Merge pull request #21609 from colemanw/afformFix
Afform - fix loading embedded blocks