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
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
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
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 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
Eileen McNaughton [Sun, 26 Sep 2021 23:15:05 +0000 (12:15 +1300)]
Merge pull request #21629 from eileenmcnaughton/test_cont2
Test cleanup -convert to use postProcess
Coleman Watts [Sun, 26 Sep 2021 23:04:49 +0000 (19:04 -0400)]
Fix dev/core#2867 - APIv4 Entity.get to return class name by default
Ad-hoc entities (which includes the Entity entity) now default to not
return any fields not declared in GetFields.
Eileen McNaughton [Sun, 26 Sep 2021 22:27:11 +0000 (11:27 +1300)]
Merge pull request #21625 from demeritcowboy/settings-dep
Setting::getItem - use deprecatedWarning instead of just logging
Eileen McNaughton [Sun, 26 Sep 2021 22:09:19 +0000 (11:09 +1300)]
Enotice fixes
Eileen McNaughton [Sun, 26 Sep 2021 21:54:04 +0000 (10:54 +1300)]
enotice fix
Eileen McNaughton [Sun, 26 Sep 2021 20:54:04 +0000 (09:54 +1300)]
Convert more tests to call postProcess
Eileen McNaughton [Sun, 26 Sep 2021 21:39:07 +0000 (10:39 +1300)]
Fix test to use postProcess
Eileen McNaughton [Sun, 26 Sep 2021 21:20:25 +0000 (10:20 +1300)]
Test cleanup -convert to use postProcess
demeritcowboy [Sun, 26 Sep 2021 14:19:19 +0000 (10:19 -0400)]
noisier
Coleman Watts [Sun, 26 Sep 2021 20:17:08 +0000 (16:17 -0400)]
SearchKit - Style buttons for compatability with Shoreditch theme
colemanw [Sun, 26 Sep 2021 19:58:07 +0000 (15:58 -0400)]
Merge pull request #21622 from eileenmcnaughton/test_cont
Test cleanup
colemanw [Sun, 26 Sep 2021 19:56:25 +0000 (15:56 -0400)]
Merge pull request #21570 from eileenmcnaughton/leg_contact
dev/core#2650 dev/core#2814 Add support for preferred syntax for contact tokens
colemanw [Sun, 26 Sep 2021 19:23:16 +0000 (15:23 -0400)]
Merge pull request #21600 from colemanw/searchKitEquations
SearchKit - Add UI for arithmetic equations
Coleman Watts [Fri, 24 Sep 2021 16:01:07 +0000 (12:01 -0400)]
SearchKit - Add UI for arithmetic equations
Coleman Watts [Fri, 24 Sep 2021 13:11:45 +0000 (09:11 -0400)]
APIv4 - Restructure function params, add labels
demeritcowboy [Sun, 26 Sep 2021 14:03:03 +0000 (10:03 -0400)]
Merge pull request #21605 from eileenmcnaughton/gen_up
Add upgrade to replace legacy contribution tokens from message templates
Eileen McNaughton [Sun, 26 Sep 2021 08:31:14 +0000 (21:31 +1300)]
Merge pull request #21586 from colemanw/stableRandom
SearchKit - A random stable genius
Eileen McNaughton [Sun, 26 Sep 2021 03:41:23 +0000 (16:41 +1300)]
Test cleanup
This switches us to a less hacky way to interact with the form in some of the tests.
Our helpers now support us interacting with the forms in a way that better mimics
the real flow & allows us to call 'postProcess'
Eileen McNaughton [Sun, 26 Sep 2021 03:55:20 +0000 (16:55 +1300)]
Remove handling for empty required field
From is a required field - remove code to handle it being empty
Eileen McNaughton [Sun, 26 Sep 2021 06:03:22 +0000 (19:03 +1300)]
dev/core#2629 show contribution statuses on contribution form
This arose from digging into
https://lab.civicrm.org/dev/core/-/issues/2629
but I think it's a tangent....
However when editing contributions the available statuses
are not dependent on the component. Only the
contribution status is relevant
Eileen McNaughton [Sun, 26 Sep 2021 03:48:30 +0000 (16:48 +1300)]
Merge pull request #21617 from demeritcowboy/convert-date
Remove unused function - convertDateFieldsToMySQL
Eileen McNaughton [Sun, 26 Sep 2021 03:11:08 +0000 (16:11 +1300)]
Merge pull request #21618 from eileenmcnaughton/email
[Ref] Function signature cleanup
Eileen McNaughton [Sat, 25 Sep 2021 19:10:14 +0000 (08:10 +1300)]
[Ref] Function signature cleanup
Seamus Lee [Sat, 25 Sep 2021 22:00:27 +0000 (08:00 +1000)]
Merge pull request #21612 from civicrm/5.42
5.42
Tim Otten [Sat, 25 Sep 2021 10:07:29 +0000 (03:07 -0700)]
tests/events/ - Add some assertions for 'hook_civicrm_alterMailParams'
Tim Otten [Sat, 25 Sep 2021 07:28:31 +0000 (00:28 -0700)]
tests/events/ - Add some assertions for 'civi.region.render'
demeritcowboy [Sat, 25 Sep 2021 18:03:45 +0000 (14:03 -0400)]
unused function
demeritcowboy [Sat, 25 Sep 2021 17:49:11 +0000 (13:49 -0400)]
Merge pull request #21608 from eileenmcnaughton/email
[REF] Return the sendEmail function to it's owner
Matthew Wire [Sat, 25 Sep 2021 13:50:00 +0000 (14:50 +0100)]
Merge pull request #21469 from mattwire/updatesubscriptionform
Fix display of subscription frequency on 'Update Subscription' form
Tim Otten [Fri, 28 May 2021 09:44:48 +0000 (02:44 -0700)]
EventChecker - Activate during unit-tests
Tim Otten [Fri, 28 May 2021 09:42:41 +0000 (02:42 -0700)]
EventChecker - Add base-class and loader
Eileen McNaughton [Sat, 25 Sep 2021 04:56:16 +0000 (16:56 +1200)]
Merge pull request #21594 from agileware/CIVICRM-1844
Remove all references to safe_mode, DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0
Seamus Lee [Sat, 25 Sep 2021 02:50:50 +0000 (12:50 +1000)]
Merge pull request #21601 from eileenmcnaughton/542
dev/core#2861 Saved search loading fix
Coleman Watts [Sat, 25 Sep 2021 00:13:54 +0000 (20:13 -0400)]
Afform - fix loading embedded blocks
Eileen McNaughton [Fri, 24 Sep 2021 19:35:30 +0000 (07:35 +1200)]
dev/core#2861 Saved search loading fix
Tim Otten [Fri, 24 Sep 2021 22:38:47 +0000 (15:38 -0700)]
Merge pull request #21597 from seamuslee001/flexmailer_unicode
CRM-19236 - Fix Flexmailer extension to support unicode urls
Eileen McNaughton [Thu, 23 Sep 2021 11:25:28 +0000 (23:25 +1200)]
Extend token date handling to 'most' date fields
Note I hit an error locally in tests on
variant of this - so throwing against jenkins as my first stop
Seamus Lee [Fri, 24 Sep 2021 21:36:59 +0000 (07:36 +1000)]
Merge pull request #21602 from eileenmcnaughton/broke
Remove broken code
Eileen McNaughton [Fri, 24 Sep 2021 21:20:15 +0000 (09:20 +1200)]
Add upgrade to token style
Eileen McNaughton [Fri, 24 Sep 2021 21:13:14 +0000 (09:13 +1200)]
Return the sendEmail function to it's owner
This sendEmail function is only called from one place in core and it is not 'generally useful' having
an awful parameter set. This PR moves it back to the class that 'owns' it - which will
allow us to undo all the work of building up that parameter set
and make it possible to support tokens for other entities than those already mangled in.
I would normally add a noisy deprecation notice once a function becomes unused in
core but since that has been done to the pdf task this release I've left this
deprecation a bit quieter for now.
Note that I cleaned up the tokens handled here before deprecating so we
could get rid of those calls fully
Under the OO structure it becomes easier to add the missing token options
- membership & participant - but the business of 'one email per person, &
just grab the tokens from the last entity' is messing with
my head a bit. That's the next bit....
demeritcowboy [Fri, 24 Sep 2021 20:44:55 +0000 (16:44 -0400)]
Merge pull request #21565 from eileenmcnaughton/email
dev/core#2851 Fix send email task contribution tokens to the processor
Coleman Watts [Fri, 24 Sep 2021 20:42:12 +0000 (16:42 -0400)]
Afform - Accept default field values from the url
On a submission-type form, the args will be prefixed with their entity names,
e.g. civicrm/my-afform#?Individual.first_name=Bob
On a search form the args don't need a prefix and just use the name of the field
Yashodha Chaku [Fri, 24 Sep 2021 11:24:37 +0000 (16:54 +0530)]
Add upgrade to replace legacy contribution tokens from message templates
Under legacy token replacement these 4 work
contribution.contribution_status
contribution.contribution_status_id:label
contribution.campaign
contribution.campaign_id:label
But only the label ones work with the processor. This upgrades the
old ones our of the message templates table
Eileen McNaughton [Fri, 24 Sep 2021 19:50:03 +0000 (07:50 +1200)]
Remove broken code
I don't even know what this is supposed to do - but since the function
has been missing for our entire git history it must
be unreachable.
https://github.com/civicrm/civicrm-core/blob/
4d5c2eb510a6be0017085d1f8dae09495e28e74b/CRM/Contact/BAO/SearchCustom.php
Eileen McNaughton [Tue, 21 Sep 2021 20:47:51 +0000 (08:47 +1200)]
dev/core#2851 Fix send email task contribution tokens to the processor
Yashodha Chaku [Fri, 24 Sep 2021 11:24:37 +0000 (16:54 +0530)]
Merge pull request #21598 from agileware/CIVICRM-1846
Find Activities Search, default search option for Activity Text is set to "both" in the code, but should actually be set to 6 which is the value for "both"
Justin Freeman [Fri, 24 Sep 2021 06:07:27 +0000 (16:07 +1000)]
CIVICRM-1846 Find Activities Search, default search option for Activity Text is set to "both" in the code, but should actually be set to 6 which is the value for "both"
Seamus Lee [Fri, 24 Sep 2021 06:04:26 +0000 (16:04 +1000)]
[REF] CRM-19236 Fix Flexmailer extension to support unicode urls
Justin Freeman [Fri, 24 Sep 2021 05:11:23 +0000 (15:11 +1000)]
CIVICRM-1844 Remove all references to safe_mode, DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0
Seamus Lee [Fri, 24 Sep 2021 03:05:08 +0000 (13:05 +1000)]
Merge pull request #21588 from eileenmcnaughton/cancel
Add test to cancel subscription form
Eileen McNaughton [Thu, 23 Sep 2021 21:12:25 +0000 (09:12 +1200)]
Add test to cancel subscription form
Eileen McNaughton [Thu, 23 Sep 2021 22:11:19 +0000 (10:11 +1200)]
Merge pull request #21585 from eileenmcnaughton/compat
Fix test
Seamus Lee [Thu, 23 Sep 2021 20:12:03 +0000 (06:12 +1000)]
Merge pull request #21538 from mattwire/subscriptioncleanup
Clean up UpdateBilling/UpdateSubscription/ContributionRecur to use getters
Eileen McNaughton [Thu, 23 Sep 2021 11:42:30 +0000 (23:42 +1200)]
Fix test
Fixes test logic I accidentally voided
colemanw [Thu, 23 Sep 2021 19:19:56 +0000 (15:19 -0400)]
Merge pull request #21457 from colemanw/searchDisplayAfformDelete
Fixes dev/core#2824 - Handle related Afforms when deleting Search Displays
Matthew Wire [Thu, 23 Sep 2021 17:28:04 +0000 (18:28 +0100)]
Merge pull request #21577 from jmcclelland/display-backend-recur-options
ensure recur options are present on backend cc contribution form.
Matthew Wire [Thu, 23 Sep 2021 17:24:08 +0000 (18:24 +0100)]
Merge pull request #21484 from JKingsnorth/price-field-id-css
Add unique class to price field template
Jamie McClelland [Thu, 23 Sep 2021 15:47:13 +0000 (11:47 -0400)]
remove type hint to return bool - we are no longer using the ret value.
Jamie McClelland [Wed, 22 Sep 2021 14:00:36 +0000 (10:00 -0400)]
ensure recur options are present on backend cc contribution form.
We seem to be adding an extra check to see if the given
payment processor has any credit card fields before including the
recur option on the backend contribution page. But some processors,
like Stripe, insert the fields via javascript. It should be enough
to just test for the existence of a payment processor that supports
recur to run the block.
Also, no other code is checking the return value of buildPaymentForm
so removing it.
Coleman Watts [Thu, 23 Sep 2021 13:57:43 +0000 (09:57 -0400)]
SearchKit - Keep randomly sorted results stable across pages
SearchKit allows ORDER BY RAND() but this can cause unexpected reshuffling
when using the pager, editing-in-place or bulk-updating records.
The solution is to generate a seed on the client-side when the display initializes,
and re-use it every time results are fetched. This keeps the order stable,
only reshuffling when the browser reloads the page.
Matthew Wire [Thu, 23 Sep 2021 10:56:13 +0000 (11:56 +0100)]
Add standardized params for billingStateProvince and billingCountry
Matthew Wire [Sun, 19 Sep 2021 10:12:52 +0000 (11:12 +0100)]
Clean up UpdateBilling/UpdateSubscription/ContributionRecur to use getters
Seamus Lee [Thu, 23 Sep 2021 07:48:07 +0000 (17:48 +1000)]
Merge pull request #21525 from eileenmcnaughton/cont_dep
dev/core#2851 Block use of legacy style contribution tokens