Eileen McNaughton [Sun, 26 Sep 2021 21:39:07 +0000 (10:39 +1300)]
Fix test to use postProcess
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: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
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
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
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
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
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
Eileen McNaughton [Thu, 23 Sep 2021 06:18:40 +0000 (18:18 +1200)]
Merge pull request #21580 from demeritcowboy/tokerr
dev/core#2856 - Token "filter" can be null so filter[0] doesn't exist
Tim Otten [Thu, 23 Sep 2021 04:31:03 +0000 (21:31 -0700)]
Merge pull request #21568 from eileenmcnaughton/labels
dev/core#2814 fix tokenCompat to be consistent with unresolved tokens
demeritcowboy [Thu, 23 Sep 2021 02:24:30 +0000 (22:24 -0400)]
null
Eileen McNaughton [Thu, 23 Sep 2021 01:12:38 +0000 (13:12 +1200)]
Merge pull request #21579 from eileenmcnaughton/notice
Enotice fix
Eileen McNaughton [Thu, 23 Sep 2021 00:54:43 +0000 (12:54 +1200)]
Remove old comment
Eileen McNaughton [Thu, 23 Sep 2021 00:45:15 +0000 (12:45 +1200)]
Merge pull request #21574 from colemanw/searchPrimary
Fixes dev/core#2852 - Add is_primary as a default SearchKit filter
Tim Otten [Thu, 23 Sep 2021 00:25:45 +0000 (17:25 -0700)]
(REF) TokenCompatSubscriber - Simplify expression that replaces unknown tokens
Additionally, this uses the regex from `TokenProcessor` instead of the regex from `CRM_Utils_Token`.
These differ in whether they capture the '|filter' expressions.
Tim Otten [Wed, 22 Sep 2021 23:52:47 +0000 (16:52 -0700)]
(REF) TokenProcessor::visitTokens() - Increase visibility. Refine comments+tests.
Seamus Lee [Wed, 22 Sep 2021 23:27:58 +0000 (09:27 +1000)]
Merge pull request #21564 from lcdservices/dev-core-2850
dev/core#2850 update_email_resetdate consider opt out on hold
Seamus Lee [Wed, 22 Sep 2021 23:27:23 +0000 (09:27 +1000)]
Merge pull request #21572 from colemanw/afformEvents
Afform - Add getters/setters to the AfformSubmitEvent class
Eileen McNaughton [Wed, 22 Sep 2021 23:19:08 +0000 (11:19 +1200)]
Enotice fix
Eileen McNaughton [Wed, 22 Sep 2021 22:49:59 +0000 (10:49 +1200)]
Merge pull request #21551 from colemanw/sqlEquation
APIv4 - Add support for sql equations
Eileen McNaughton [Wed, 22 Sep 2021 22:48:35 +0000 (10:48 +1200)]
Merge pull request #21569 from totten/master-datets
CRM_Utils_Date - Month and day names should match active locale
Coleman Watts [Wed, 22 Sep 2021 14:45:50 +0000 (10:45 -0400)]
Fixes dev/core#2852 - Add is_primary as a default SearchKit filter
When joining Contacts to emails, addresses, phones and IMs this will
automatically add is_primary=1 as a default search criteria.
Eileen McNaughton [Wed, 22 Sep 2021 06:18:31 +0000 (18:18 +1200)]
dev/core#2814 fix tokenCompat to be consistent with unresolved tokens
This fixes the tokenCompat subscriber to replace unresolved tokens with a
blank string in a consistent way.
Prior to this it would crash if smarty was enabled but not all tokens
were resolved & print unresolved tokens if smarty was not enabled.
The inconsistencies appear to be due to 'separate evolution' rather than '*reasons*'
Eileen McNaughton [Wed, 22 Sep 2021 22:30:56 +0000 (10:30 +1200)]
Merge pull request #21557 from eileenmcnaughton/log
Fix bug where log hook is ignored on custom field create
Tim Otten [Wed, 22 Sep 2021 06:48:46 +0000 (23:48 -0700)]
(NFC) TokenProcessorTest - When formatting dates, month and day names should be localized
Tim Otten [Wed, 22 Sep 2021 06:48:06 +0000 (23:48 -0700)]
CRM_Utils_Date - Month and day names should match active locale
colemanw [Wed, 22 Sep 2021 20:27:12 +0000 (16:27 -0400)]
Merge pull request #21531 from eileenmcnaughton/now
Add {domain.now}, supporting |crmDate
Eileen McNaughton [Wed, 22 Sep 2021 20:16:58 +0000 (08:16 +1200)]
Merge pull request #21576 from demeritcowboy/ufval
UFMatch - E_NOTICE when nonexistent uf_id
Coleman Watts [Mon, 20 Sep 2021 16:33:07 +0000 (12:33 -0400)]
APIv4 - Add support for sql equations
Eileen McNaughton [Tue, 21 Sep 2021 00:52:26 +0000 (12:52 +1200)]
Fix bug where log hook is ignored on custom field create
It is possible to specify that various tables should not
result in a log table via the `alterLogTables` hook.
This is useful for excluding tables of low information
value or tables like summary fields that are calculated
values. However, when altering custom fields this
hook's output was being ignored as it was going through
the specific path of
which did not have awareness of this hook.
This code path is the primary use for this function.
It's also called via createMissingLogTables - but in
that case the calculation is already done. It is not
elsewhere in git universe and the return value
is never used, so I removed it
Eileen McNaughton [Wed, 22 Sep 2021 19:31:22 +0000 (07:31 +1200)]
Merge pull request #21578 from civicrm/5.42
5.42 to master
Eileen McNaughton [Wed, 22 Sep 2021 19:30:30 +0000 (07:30 +1200)]
Merge pull request #21575 from agh1/5.42.0-releasenotes-initial
5.42.0 release notes initial run
demeritcowboy [Wed, 22 Sep 2021 16:39:32 +0000 (12:39 -0400)]
don't crash for nonexistent uf_id
Coleman Watts [Wed, 22 Sep 2021 13:25:15 +0000 (09:25 -0400)]
Afform - Add getters/setters to the AfformSubmitEvent class
This makes it easier for 3rd-parties to interact with the event.
Andie Hunt [Wed, 22 Sep 2021 15:45:21 +0000 (11:45 -0400)]
5.42.0 release notes: added boilerplate
Andie Hunt [Wed, 22 Sep 2021 15:44:57 +0000 (11:44 -0400)]
5.42.0 release notes: raw from script
demeritcowboy [Wed, 22 Sep 2021 13:51:02 +0000 (09:51 -0400)]
Merge pull request #21554 from eileenmcnaughton/loop
[REF] Remove illusion of looping
Brian Shaughnessy [Wed, 22 Sep 2021 12:23:51 +0000 (08:23 -0400)]
dev/core#2850 add comment
Eileen McNaughton [Wed, 22 Sep 2021 12:00:29 +0000 (00:00 +1200)]
dev/core#2814 Add support for preferred syntax for contact tokens
This maintains support for all currently advertised tokens. But it
switches the advertisement to our preferred style (matching the db field,
specifically denoting if the label is desired.) Tests for both styles are added.
This is a step towards switching to apiv4. An important difference with v4 is
that we can distinquish between 'not fetched' and 'empty' - saving us
from extra queries when it is not clear - which will in turn
allow us to switch greeting
processing over & still support the performance tweaks via
that method
Tim Otten [Wed, 22 Sep 2021 06:30:22 +0000 (23:30 -0700)]
(NFC) TokenSmartyTest - Add some more examples, mixing token-filters and Smarty-filters
Tim Otten [Wed, 22 Sep 2021 05:09:49 +0000 (22:09 -0700)]
TokenProcessor - Filter args should require quotes (to match Smarty notation)
Eileen McNaughton [Wed, 22 Sep 2021 01:39:52 +0000 (13:39 +1200)]
Merge pull request #21563 from eileenmcnaughton/ev_toke
Initial test on event tokens
Eileen McNaughton [Wed, 22 Sep 2021 00:42:32 +0000 (12:42 +1200)]
Fix tokens to pass filters through
Tim Otten [Tue, 21 Sep 2021 10:22:03 +0000 (03:22 -0700)]
TokenProcessor - render() and addMessage() should use same regex to find tokens
Tim Otten [Tue, 21 Sep 2021 10:18:36 +0000 (03:18 -0700)]
TokenConsistencyTest - Fix assertion
This is a new/recent assertion. Not passing. Looks different from other/similar assertions.
Tim Otten [Tue, 21 Sep 2021 08:47:52 +0000 (01:47 -0700)]
TokenConsistencyTest - Use a valid timestamp
Tim Otten [Tue, 21 Sep 2021 08:47:08 +0000 (01:47 -0700)]
DomainTokens - {domain.now} should abide by mocked times
Eileen McNaughton [Sat, 18 Sep 2021 23:24:18 +0000 (11:24 +1200)]
Add now token
colemanw [Wed, 22 Sep 2021 00:23:43 +0000 (20:23 -0400)]
Merge pull request #21566 from eileenmcnaughton/render
Remove deprecated code lines
Eileen McNaughton [Tue, 21 Sep 2021 19:31:29 +0000 (07:31 +1200)]
Test cleanup
Fixes passing null to event create. Remove some tests duplicated by syntaxconformance
Matthew Wire [Tue, 21 Sep 2021 22:07:43 +0000 (23:07 +0100)]
Merge pull request #21555 from eileenmcnaughton/money
dev/core#2493 Add support for money laundry in `getSubmittedValue`
Matthew Wire [Tue, 21 Sep 2021 22:03:50 +0000 (23:03 +0100)]
Merge pull request #21430 from mattwire/flushcache
flushCaches should respect permitCacheFlushMode. Also flush caches which have a NULL cache_date
Eileen McNaughton [Tue, 21 Sep 2021 21:33:44 +0000 (09:33 +1200)]
Remove deprecated code lines
These have been deprecated for around 8 months
, are not used in core, and are in code where
5.43 will already require extra testing so let's remove
so we can simplify
Eileen McNaughton [Tue, 21 Sep 2021 09:06:13 +0000 (21:06 +1200)]
Initial test on event tokens
Note there is an issue to do with caching affecting the custom token but
it's out of scope on this test
Brian Shaughnessy [Tue, 21 Sep 2021 19:43:26 +0000 (15:43 -0400)]
dev/core#2850 update_email_resetdate consider opt out on hold
demeritcowboy [Tue, 21 Sep 2021 19:34:24 +0000 (15:34 -0400)]
Merge pull request #21553 from eileenmcnaughton/email2
[Ref] Extend email trait test, process more sanely
Tim Otten [Tue, 21 Sep 2021 10:09:11 +0000 (03:09 -0700)]
Merge pull request #21494 from eileenmcnaughton/compat
dev/core#2814 TokenCompatSubscriber - evaluate contact tokens during civi.token.eval phase
Eileen McNaughton [Tue, 21 Sep 2021 09:55:34 +0000 (21:55 +1200)]
Merge pull request #21374 from ufundo/event-custom-tokens
Fix event custom field tokens in scheduled reminders
Eileen McNaughton [Tue, 21 Sep 2021 07:18:30 +0000 (19:18 +1200)]
Merge pull request #21560 from demeritcowboy/report-query-string
CiviReport - avoid error in test environments when using built-in php web server
Eileen McNaughton [Mon, 20 Sep 2021 21:00:29 +0000 (09:00 +1200)]
[Ref] Extend email trait test, process more sanely
Eileen McNaughton [Sun, 19 Sep 2021 10:44:20 +0000 (22:44 +1200)]
[REF] Extract getFromValues, add test
This extracts the code used to get the from values, moves the default setting
to the default and adds a test.
The goal is actually to add a test on the submit function
but it's proving to be challenging so this at least gets the
default setting tested.
Note that this code used to be on a static class, not a trait, and
some stuff is in weird places - in particular stuff that
should be in setDefaults and postProcess is happening on
preProcess. However, most
of the classes that override this
trait do not do much more than call the trait so that helps at
least
Eileen McNaughton [Tue, 21 Sep 2021 04:38:05 +0000 (16:38 +1200)]
Merge pull request #21561 from civicrm/5.42
5.42 to master
Eileen McNaughton [Tue, 21 Sep 2021 04:37:33 +0000 (16:37 +1200)]
Merge pull request #21559 from eileenmcnaughton/542
dev/core#2843 push new link to the end