colemanw [Fri, 6 Aug 2021 14:51:20 +0000 (10:51 -0400)]
Merge pull request #21038 from eileenmcnaughton/tok_names
Switch to using apiv4 for metadata
demeritcowboy [Fri, 6 Aug 2021 14:28:07 +0000 (10:28 -0400)]
Merge pull request #21041 from eileenmcnaughton/notice2
Enotice fix
Eileen McNaughton [Fri, 6 Aug 2021 09:03:13 +0000 (21:03 +1200)]
Merge pull request #21040 from eileenmcnaughton/tpl
Enotice fix
Eileen McNaughton [Fri, 6 Aug 2021 07:26:02 +0000 (19:26 +1200)]
Merge pull request #20752 from samuelsov/ReportGroup
Make report subtotals work for custom fields
Eileen McNaughton [Fri, 6 Aug 2021 06:56:39 +0000 (18:56 +1200)]
Enotice fix
This one is a bit of a brain twister but I'm pretty sure the re-ordered IF has the
same result - but one less enotice
Eileen McNaughton [Fri, 6 Aug 2021 06:51:07 +0000 (18:51 +1200)]
Merge pull request #20989 from mattwire/mailtasks
Fix mailing task when there are no tasks
Eileen McNaughton [Fri, 6 Aug 2021 06:32:05 +0000 (18:32 +1200)]
Enotice fix
Eileen McNaughton [Fri, 6 Aug 2021 01:55:04 +0000 (13:55 +1200)]
Switch to using apiv4 for metadata
Eileen McNaughton [Fri, 6 Aug 2021 04:39:28 +0000 (16:39 +1200)]
Merge pull request #21036 from eileenmcnaughton/act_mon
Reconcile contribution amount tokens
Eileen McNaughton [Fri, 6 Aug 2021 00:38:49 +0000 (12:38 +1200)]
Reconcile contribution amount tokens
This adds non_deductible_amount, as identified in https://github.com/civicrm/civicrm-core/pull/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
Eileen McNaughton [Fri, 6 Aug 2021 02:59:35 +0000 (14:59 +1200)]
Merge pull request #21037 from eileenmcnaughton/act_source
Fix advertised token for source
Eileen McNaughton [Fri, 6 Aug 2021 02:47:29 +0000 (14:47 +1200)]
Merge pull request #21035 from eileenmcnaughton/act_more
Update contribution_page_id token in sched reminders
Eileen McNaughton [Thu, 5 Aug 2021 23:12:43 +0000 (11:12 +1200)]
Update contribution_page_id token in sched reminders
Eileen McNaughton [Fri, 6 Aug 2021 00:51:38 +0000 (12:51 +1200)]
Fix advertised token for source
Seamus Lee [Thu, 5 Aug 2021 23:11:11 +0000 (09:11 +1000)]
Merge pull request #21000 from eileenmcnaughton/act_more
Reconcile and upgrade tokens for payment instrument, financial type
Eileen McNaughton [Mon, 2 Aug 2021 21:40:32 +0000 (09:40 +1200)]
Reconcile and upgrade tokens for payment instrument, financial type
This switches the last 2 'alias' tokens from Contribute_Tokens to the preferred format,
adds tests & upgrade and switches the advertised tokens. I tested & the token
removed from the sent letter collection still works
Next step is to analyse the remaining differences between the 2 sets of tokens.
My suspicion is that we have enough metadata that we use in search kit that we
don't need a hard-coded white list of tokens in 2 different places & can just
expose 'all the fields' that are not acl or otherwise limited
Seamus Lee [Thu, 5 Aug 2021 21:21:39 +0000 (07:21 +1000)]
Merge pull request #20999 from eileenmcnaughton/act_up
Switch contribution action schedule tokens to use advertised tokens for cancel_date & source
Seamus Lee [Thu, 5 Aug 2021 21:20:24 +0000 (07:20 +1000)]
Merge pull request #21019 from ejegg/customFieldBulkLog
Fix bulk adding custom fields with logging on
Mathieu Lu [Thu, 5 Aug 2021 13:10:59 +0000 (09:10 -0400)]
Merge pull request #21033 from kurund/patch-2
Update contributor-key.yml
Kurund Jalmi [Thu, 5 Aug 2021 13:09:32 +0000 (14:09 +0100)]
Update contributor-key.yml
Seamus Lee [Thu, 5 Aug 2021 10:09:13 +0000 (20:09 +1000)]
Merge pull request #21032 from seamuslee001/master
5.40 up merge
Seamus Lee [Thu, 5 Aug 2021 10:08:31 +0000 (20:08 +1000)]
Merge in 5.40
Tim Otten [Thu, 5 Aug 2021 10:03:40 +0000 (03:03 -0700)]
Merge pull request #21031 from totten/5.40-bump0
5.40.0 - Version bump. More release notes.
Tim Otten [Thu, 5 Aug 2021 09:15:21 +0000 (02:15 -0700)]
Set version to 5.40.0
Tim Otten [Thu, 5 Aug 2021 09:14:06 +0000 (02:14 -0700)]
Tweak release-notes/5.40.0.md
Seamus Lee [Thu, 5 Aug 2021 09:11:32 +0000 (19:11 +1000)]
Merge pull request #21028 from eileenmcnaughton/540
dev/event#62 - Expose all price fields to backend form (5.40)
Tim Otten [Thu, 5 Aug 2021 08:35:00 +0000 (01:35 -0700)]
Add release-notes/5.39.1.md
Brian Shaughnessy [Thu, 29 Jul 2021 14:56:41 +0000 (10:56 -0400)]
dev/event#62 expose all price fields to backend form
Eileen McNaughton [Thu, 5 Aug 2021 06:10:13 +0000 (18:10 +1200)]
Merge pull request #21020 from colemanw/fixWPUrlHash
[REGRESSION] Fix CRM.url to not encode hash on WP
Tim Otten [Thu, 5 Aug 2021 06:09:09 +0000 (23:09 -0700)]
Merge pull request #21014 from eileenmcnaughton/pf
dev/core#2739 - Fix contribution tasks using wrong IDs
Seamus Lee [Thu, 5 Aug 2021 04:10:22 +0000 (14:10 +1000)]
Merge pull request #21012 from eileenmcnaughton/540
dev/core#2725 Fix regression permitting circular group resolution
Seamus Lee [Thu, 5 Aug 2021 04:08:51 +0000 (14:08 +1000)]
Merge pull request #21022 from eileenmcnaughton/sched
dev/core#2735 fix for effective start & end date not updating
Coleman Watts [Thu, 5 Aug 2021 01:38:12 +0000 (21:38 -0400)]
Fix CRM.url to not encode hash on WP
Eileen McNaughton [Thu, 5 Aug 2021 02:23:14 +0000 (14:23 +1200)]
dev/core#2735 fix for effective start & end date not updating
Eileen McNaughton [Wed, 4 Aug 2021 21:39:59 +0000 (09:39 +1200)]
dev/core#2725 Fix regression permitting circular group resolution
Eileen McNaughton [Thu, 5 Aug 2021 02:07:11 +0000 (14:07 +1200)]
Merge pull request #21005 from colemanw/afformFieldDefaults
Afform - support default values for fields
Eileen McNaughton [Thu, 5 Aug 2021 02:00:29 +0000 (14:00 +1200)]
Merge pull request #21017 from totten/5.40-captcha-link
dev/core#2728 - ReCAPTCHA - Consistently present link to settings
Seamus Lee [Thu, 5 Aug 2021 01:41:11 +0000 (11:41 +1000)]
Merge pull request #21016 from eileenmcnaughton/jamie
Temporary revert of changes in 20002 which caused a regression
Elliott Eggleston [Thu, 5 Aug 2021 01:23:29 +0000 (21:23 -0400)]
Fix adding many custom fields with logging on
This code is only triggered in the 'bulk' writeRecords codepath,
not in the createField codepath which is used for creating custom
fields via the UI.
To replicate: on a wmff build, turn loggin on, check out
https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/709873
and run drush update-custom-fields
Result prior to this patch: SQL syntax error message and new field
not added to logging table
Result with this patch: no error message, new field created on log
table.
Seamus Lee [Thu, 5 Aug 2021 01:06:35 +0000 (11:06 +1000)]
Merge pull request #21015 from civicrm/5.40
5.40
Tim Otten [Thu, 5 Aug 2021 00:27:28 +0000 (17:27 -0700)]
dev/core#2728 - ReCAPTCHA - Consistently present link to settings
See also: https://lab.civicrm.org/dev/core/-/issues/2728
Before
------
"ReCAPTCHA Settings" appears in "Customize Data and Screens" in the nav-menu, and it is missing in the `civicrm/admin` dashboard.
After
-----
"ReCAPTCHA Settings" appears "System Settings" for both the nav-menu and the `civicrm/admin` dashboard.
Coleman Watts [Wed, 4 Aug 2021 02:32:38 +0000 (22:32 -0400)]
Afform - support default values for fields
This adds an "afform_default" property to the field definition.
It does not use the "default_value" property from getFields because that's more
to do with Civi's schema and often not appropriate for a form.
Fixes dev/core#2734
Eileen McNaughton [Wed, 4 Aug 2021 23:49:47 +0000 (11:49 +1200)]
Avoid test failures on revert
Eileen McNaughton [Wed, 4 Aug 2021 23:45:46 +0000 (11:45 +1200)]
Revert "Issue 53 (2)"
This reverts commit
4f4fb809a77cdfb7876d662f331d524fb2eeb1b3.
Eileen McNaughton [Wed, 4 Aug 2021 23:43:26 +0000 (11:43 +1200)]
Add related contact display test
Seamus Lee [Wed, 4 Aug 2021 23:23:01 +0000 (09:23 +1000)]
Merge pull request #21013 from seamuslee001/apiv4_utf8mb4
[NFC] Fix APIv4 Utf8mb4 test to ensure no mixed collation errors
Seamus Lee [Wed, 4 Aug 2021 22:39:22 +0000 (08:39 +1000)]
Merge pull request #20929 from eileenmcnaughton/5.40
dev/wordpress#109 fix bug when is_monetary is not checked
Patrick Figel [Wed, 4 Aug 2021 15:20:48 +0000 (17:20 +0200)]
dev/core#2739 - Fix contribution tasks using wrong IDs
This fixes an issue where contribution tasks may perform actions
on unrelated contribution IDs when they're called via contact
search forms.
Eileen McNaughton [Wed, 4 Aug 2021 21:21:50 +0000 (09:21 +1200)]
Merge pull request #21008 from jmcclelland/grant-pagination
enable paging if contact has more then 50 grants.
Seamus Lee [Wed, 4 Aug 2021 21:12:22 +0000 (07:12 +1000)]
[NFC] Fix APIv4 Utf8mb4 test to ensure no mixed collation errors
Seamus Lee [Wed, 4 Aug 2021 21:08:00 +0000 (07:08 +1000)]
Merge pull request #21011 from seamuslee001/master
5.40
Seamus Lee [Wed, 4 Aug 2021 21:05:35 +0000 (07:05 +1000)]
Merge branch '5.40'
Eileen McNaughton [Wed, 4 Aug 2021 21:03:04 +0000 (09:03 +1200)]
Merge pull request #21009 from agh1/5.40.0-releasenotes-final
5.40.0 release notes - final edits
Andie Hunt [Wed, 4 Aug 2021 17:55:00 +0000 (13:55 -0400)]
5.40.0 release notes: reorganized and final edits
Andie Hunt [Wed, 4 Aug 2021 17:39:25 +0000 (13:39 -0400)]
5.40.0 release notes: added late changes
Jamie McClelland [Wed, 4 Aug 2021 17:35:06 +0000 (13:35 -0400)]
enable paging if contact has more then 50 grants.
Andie Hunt [Wed, 4 Aug 2021 17:19:04 +0000 (13:19 -0400)]
Release notes: Contributor key no longer needs Jira handles
Andie Hunt [Wed, 4 Aug 2021 17:11:25 +0000 (13:11 -0400)]
It's Andie ;)
demeritcowboy [Wed, 4 Aug 2021 13:28:57 +0000 (09:28 -0400)]
Merge pull request #21003 from eileenmcnaughton/swapsies
Use template variable to add or remove swap button.
demeritcowboy [Wed, 4 Aug 2021 13:20:29 +0000 (09:20 -0400)]
Merge pull request #20990 from eileenmcnaughton/cs
[Ref] [Test] Move custom search tests to extension
Eileen McNaughton [Wed, 4 Aug 2021 06:12:49 +0000 (18:12 +1200)]
Merge pull request #20996 from colemanw/fixAfformContactType
Afform - Use correct contact type when loading field options
Seamus Lee [Wed, 4 Aug 2021 03:23:20 +0000 (13:23 +1000)]
Merge pull request #21004 from seamuslee001/teardownftsquery
[NFC] Do a proper tear down of fts in QueryFormatterTest
Seamus Lee [Wed, 4 Aug 2021 01:05:13 +0000 (11:05 +1000)]
[NFC] Do a proper tear down of fts in QueryFormatterTest
Seamus Lee [Wed, 4 Aug 2021 00:58:48 +0000 (10:58 +1000)]
[NFC] Do a proper tear down of fts in QueryFormatterTest
Eileen McNaughton [Tue, 3 Aug 2021 23:30:19 +0000 (11:30 +1200)]
Use template variable to add or remove swap button.
In combination with email notifications this button can be dangerous - ie an accidental click and
a donor rather than a staff member gets the email.
My thinking is to disable this via the activity assignee extension,
https://lab.civicrm.org/extensions/assignee/-/issues/2 - but it's cleaner for
an extension to intervene by setting a smarty variable than using javascript
to remove the button and I feel like it makes more sense for the form to
assign 'instruction variables' than for the decision to freeze to
also have 'hidden' effects further down
Eileen McNaughton [Mon, 2 Aug 2021 21:09:54 +0000 (09:09 +1200)]
Switch contribution action schedule tokens to use advertised tokens for cancel_date & source
Scheduled reminders was working with the incorrect and not advertised variants - this
switches over and upgrades ( a bit precautionary since the removed ones were not
in the widget)
Seamus Lee [Tue, 3 Aug 2021 04:39:45 +0000 (14:39 +1000)]
Merge pull request #21002 from demeritcowboy/smarty-managecase
Smarty warnings on Manage Case
demeritcowboy [Tue, 3 Aug 2021 02:51:04 +0000 (22:51 -0400)]
smarty warnings
Seamus Lee [Mon, 2 Aug 2021 22:56:42 +0000 (08:56 +1000)]
Merge pull request #20998 from eileenmcnaughton/id
Rename legacy token for contribution id to match sched reminder tokens
Eileen McNaughton [Mon, 2 Aug 2021 20:54:49 +0000 (08:54 +1200)]
Rename legacy token for contribution id to match sched reminder tokens
In this case it turns out
1) the token being advertised by scheduled reminders is more correct ('id')
2) the legacy method resolves either 'id' or 'contribution_id' and
3) changing the advertised token from 'contribution.contribution_id' to contribution.id
does not cause contribution_id to stop working
So in summary - the advertised token was working in 'send letter' but not
in scheduled reminders. And changing which is advertised doesn't stop
the other from working in send letter
Eileen McNaughton [Mon, 2 Aug 2021 19:25:43 +0000 (07:25 +1200)]
Merge pull request #20994 from demeritcowboy/upgrade-message-2
Fix upgrade message when nothing was changed
Coleman Watts [Mon, 2 Aug 2021 18:29:10 +0000 (14:29 -0400)]
Afform - Use correct contact type when loading field options
Fixes dev/core#2702
demeritcowboy [Mon, 2 Aug 2021 16:02:38 +0000 (12:02 -0400)]
fix empty message
demeritcowboy [Mon, 2 Aug 2021 15:28:13 +0000 (11:28 -0400)]
Merge pull request #20993 from kainuk/vcard_notice
Do not generate a notice when a vcard is downloaded with a non-primary email or non-primary phone number
demeritcowboy [Mon, 2 Aug 2021 14:57:52 +0000 (10:57 -0400)]
Merge pull request #20958 from mlutfy/myCaseLabels
Case Dashboard: fix labels on my/all radio buttons, and simplify label text
Klaas Eikelboom [Mon, 2 Aug 2021 13:18:56 +0000 (15:18 +0200)]
Do not generate a notice when a vcard is downloaded
Eileen McNaughton [Mon, 2 Aug 2021 08:45:05 +0000 (20:45 +1200)]
Merge pull request #20921 from eileenmcnaughton/cleanup3
Fix for failure (fatal error and silent failure) to clean up full text indices
Eileen McNaughton [Mon, 2 Aug 2021 07:15:37 +0000 (19:15 +1200)]
Merge pull request #20978 from eileenmcnaughton/act_up
Add upgrade routine to remove old action schedule token
Eileen McNaughton [Wed, 21 Jul 2021 07:28:14 +0000 (19:28 +1200)]
Fix for failure to cleanup full text indices
Eileen McNaughton [Mon, 2 Aug 2021 00:17:00 +0000 (12:17 +1200)]
[Ref] [Test] Move custom search tests to extension
This is a bit of a big lift because I had to re-write the tests a bit to run in the extension context -
but all part of the process of core extensionising. Still not gonna tackle another one of the classes today
Eileen McNaughton [Fri, 30 Jul 2021 08:22:34 +0000 (20:22 +1200)]
Add upgrade routine to remove old action schedule token
This adds a routing to swap out the action schedule tokens on upgrade.
Given the token is completely invisible in the UI it's unlikely it is in use anywhere but
rather than just remove it from Contribute_Tokens this adds the upgrade
routine to remove this token, and others
Eileen McNaughton [Mon, 2 Aug 2021 00:46:46 +0000 (12:46 +1200)]
Merge pull request #20947 from colemanw/sqlFunctions
dev/core#2704 SearchKit - Add support for SQL functions
Eileen McNaughton [Sun, 1 Aug 2021 21:44:06 +0000 (09:44 +1200)]
Merge pull request #20986 from demeritcowboy/upgrade-message-formatting
Upgrade message is scrunched up next to the previous sentence
Matthew Wire [Sun, 1 Aug 2021 18:24:16 +0000 (19:24 +0100)]
Fix mailing task when there are no tasks
Matthew Wire [Sun, 1 Aug 2021 11:44:59 +0000 (12:44 +0100)]
Merge pull request #20988 from colemanw/fixCaseExport
Move/rename case export files for consistency
Coleman Watts [Sun, 1 Aug 2021 05:21:25 +0000 (01:21 -0400)]
Move/rename case export files for consistency
Matthew Wire [Sat, 31 Jul 2021 17:20:57 +0000 (18:20 +0100)]
Merge pull request #20944 from eileenmcnaughton/tiles
Test, enotice fixes, handling for permissions key for Member_Tasks
Matthew Wire [Sat, 31 Jul 2021 17:15:22 +0000 (18:15 +0100)]
Merge pull request #20909 from eileenmcnaughton/index
Improve cleanup on indexer test
Matthew Wire [Sat, 31 Jul 2021 17:14:14 +0000 (18:14 +0100)]
Merge pull request #20969 from eileenmcnaughton/mem
[REF] minor fix - move last of processing before receipting
Matthew Wire [Sat, 31 Jul 2021 17:13:36 +0000 (18:13 +0100)]
Merge pull request #20971 from eileenmcnaughton/inv2
dev/core#2719 [REF] Remove legacy reference to contribution_invoice_settings
Matthew Wire [Sat, 31 Jul 2021 17:13:03 +0000 (18:13 +0100)]
Merge pull request #20977 from eileenmcnaughton/status_name
Update label on payment instrument
Matthew Wire [Sat, 31 Jul 2021 17:12:39 +0000 (18:12 +0100)]
Merge pull request #20979 from mlutfy/memberTaxes
New membership: fix tax amount translation
Matthew Wire [Sat, 31 Jul 2021 17:10:00 +0000 (18:10 +0100)]
Merge pull request #20951 from eileenmcnaughton/act
Activity tasks - don't add invalid tasks
demeritcowboy [Sat, 31 Jul 2021 16:21:03 +0000 (12:21 -0400)]
message is scrunched up next to the previous sentence
Coleman Watts [Sat, 31 Jul 2021 02:00:45 +0000 (22:00 -0400)]
Hide REPLACE sql function from SearchKit
Either way this describes the 3 params, but the new way is better understood by SearchKit,
which to-date cannot handle more than one param.
colemanw [Sat, 31 Jul 2021 01:06:00 +0000 (21:06 -0400)]
Merge pull request #20872 from eileenmcnaughton/fprocessor
dev/core#2715 [REF] Start the process of moving financial processing to own class
demeritcowboy [Sat, 31 Jul 2021 00:37:17 +0000 (20:37 -0400)]
Merge pull request #20905 from eileenmcnaughton/utf8
Fix databaseSupportsUTF8MB4
Eileen McNaughton [Fri, 30 Jul 2021 22:50:14 +0000 (10:50 +1200)]
Merge pull request #20980 from demeritcowboy/upgrade-enotice
PHP E_NOTICE during upgrade
demeritcowboy [Fri, 30 Jul 2021 17:04:40 +0000 (13:04 -0400)]
php notice
demeritcowboy [Fri, 30 Jul 2021 15:52:30 +0000 (11:52 -0400)]
Merge pull request #20096 from larssandergreen/copy-template_type-when-cloning-mailing
Make final mailing from A/B test same template type and options as A/B so it can be copied