Monish Deb [Tue, 24 Aug 2021 15:59:24 +0000 (21:29 +0530)]
Merge pull request #21212 from eileenmcnaughton/541-orig
dev/financial#180 Fix line item calculation regression on line items (incorrectly treating as exclusive)
Eileen McNaughton [Tue, 24 Aug 2021 00:22:35 +0000 (12:22 +1200)]
Revert test change that 'supported' incorrect code change
https://github.com/civicrm/civicrm-core/commit/
e967ce8fe2b58b94e2163dde395542e55599da13#diff-44a947115564a688b2d6e0772ad25039b8d244225cf250dbc27ed32a134467a3L395-R396
Eileen McNaughton [Tue, 24 Aug 2021 07:09:40 +0000 (19:09 +1200)]
Merge pull request #21239 from kcristiano/dev-2784
dev/core#2784 Export PRIMARY fields Fails on CiviCRM 5.40.2 and MariaDB 10.3 with row size issue
Eileen McNaughton [Mon, 23 Aug 2021 20:57:08 +0000 (08:57 +1200)]
Move the tested but crazy tax calc to the contribution api
Eileen McNaughton [Sun, 22 Aug 2021 00:16:12 +0000 (12:16 +1200)]
Fix line item calculation from exclusive to inclusive
This was added https://github.com/civicrm/civicrm-core/commit/
e967ce8fe2b58b94e2163dde395542e55599da13#diff-a16d4d7449cf5f3a0616d1d282a32f27ab6d3f7d2726d076c02ad1d4d655af41R512
but incorrectly assumes the totalAmount is exclusive at this point - but
it is inclusive
Eileen McNaughton [Tue, 24 Aug 2021 04:23:46 +0000 (16:23 +1200)]
Merge pull request #21238 from eileenmcnaughton/541-lines
Fix test to actually pass valid data
Seamus Lee [Tue, 24 Aug 2021 03:08:30 +0000 (13:08 +1000)]
Merge pull request #21237 from seamuslee001/5.41
Add release-notes/5.40.3.md
Kevin Cristiano [Tue, 24 Aug 2021 02:12:04 +0000 (22:12 -0400)]
Export PRIMARY fields Fails on CiviCRM 5.40.2 and MariaDB 10.3
with row size issue https://lab.civicrm.org/dev/core/-/issues/2784
Eileen McNaughton [Tue, 24 Aug 2021 01:30:10 +0000 (13:30 +1200)]
Re-fix test to work with new check
A new check was enabled for this test recently and it passed because we
were doing recalculation - but that recalculation was not always right
and there is no expectation that passing in the wrong total_amount
is OK so this fixes total_amount to be equal to the
sum of the line items - which is what is checked
Tim Otten [Tue, 24 Aug 2021 01:32:01 +0000 (18:32 -0700)]
Add release-notes/5.40.3.md
Seamus Lee [Mon, 23 Aug 2021 23:28:14 +0000 (09:28 +1000)]
Merge pull request #21224 from ufundo/oauth-systoken-refresh-fix
dev/core#2779 - Specify row fields to fetch in Api4 OAuthSysToken.Refresh
Seamus Lee [Mon, 23 Aug 2021 21:31:09 +0000 (07:31 +1000)]
Merge pull request #21229 from eileenmcnaughton/cache
Test cleanup fix
Eileen McNaughton [Mon, 23 Aug 2021 19:48:09 +0000 (07:48 +1200)]
Test cleanup fix
Ubuntu [Mon, 23 Aug 2021 16:42:18 +0000 (16:42 +0000)]
implement-basicbatchaction-getselect
Eileen McNaughton [Sat, 21 Aug 2021 00:07:20 +0000 (12:07 +1200)]
Merge pull request #21195 from colemanw/UnknownFieldError
APIv4 - Properly show deprecated joins in unit tests (fixes dev/core#2771)
demeritcowboy [Fri, 20 Aug 2021 14:14:08 +0000 (10:14 -0400)]
Merge pull request #21192 from jitendrapurohit/reminder
dev/core#2777 - Fix js break on reminder form
Coleman Watts [Fri, 20 Aug 2021 14:11:34 +0000 (10:11 -0400)]
APIv4 - Properly show deprecated joins in unit tests
jitendrapurohit [Fri, 20 Aug 2021 11:49:55 +0000 (17:19 +0530)]
Fix js break on reminder form
Seamus Lee [Fri, 20 Aug 2021 04:54:11 +0000 (14:54 +1000)]
Merge pull request #21189 from eileenmcnaughton/541b
dev/rc#14 handle api calls post schema change
Eileen McNaughton [Fri, 20 Aug 2021 02:48:11 +0000 (14:48 +1200)]
dev/rc#14 handle api calls post schema change
Seamus Lee [Tue, 17 Aug 2021 06:49:42 +0000 (16:49 +1000)]
Merge pull request #21163 from seamuslee001/5.41
Add release-notes/5.40.2.md release-notes/5.40.1.md
Tim Otten [Tue, 17 Aug 2021 06:23:00 +0000 (23:23 -0700)]
Add release-notes/5.40.2.md release-notes/5.40.1.md
Eileen McNaughton [Mon, 16 Aug 2021 07:06:49 +0000 (19:06 +1200)]
Merge pull request #21151 from eileenmcnaughton/541m
Membership batch processing error
Eileen McNaughton [Mon, 16 Aug 2021 04:37:30 +0000 (16:37 +1200)]
Membership batch processing error
This fixes a fatal because of incorrect typing
Affects 5.40
Eileen McNaughton [Mon, 16 Aug 2021 01:19:21 +0000 (13:19 +1200)]
Merge pull request #21143 from seamuslee001/fix_enotice_php8
[REF] Fix e-notice in APIv3 Profile Test on PHP8
Seamus Lee [Sun, 15 Aug 2021 23:57:44 +0000 (09:57 +1000)]
Merge pull request #21147 from eileenmcnaughton/541
dev/core#2758 fix task tiles
Eileen McNaughton [Sun, 15 Aug 2021 22:01:07 +0000 (10:01 +1200)]
dev/core#2758 fix task tiles
Seamus Lee [Sat, 14 Aug 2021 23:27:39 +0000 (09:27 +1000)]
[REF] Fix e-notice in APIv3 Profile Test on PHP8
Remove e-notice issue found by dave d
Seamus Lee [Sat, 14 Aug 2021 03:12:41 +0000 (13:12 +1000)]
Merge pull request #21136 from agh1/5.41.0-releasenotes-initial
5.41.0 release notes initial run
Andie Hunt [Fri, 13 Aug 2021 22:15:31 +0000 (18:15 -0400)]
5.41.0 release notes: added boilerplate
Andie Hunt [Fri, 13 Aug 2021 22:12:51 +0000 (18:12 -0400)]
5.41.0 release notes: raw from script
Seamus Lee [Fri, 13 Aug 2021 21:27:18 +0000 (07:27 +1000)]
Merge pull request #21099 from eileenmcnaughton/camp54
dev/core#2743 fix api v3 to not unnecessarily load options
Seamus Lee [Fri, 13 Aug 2021 21:23:27 +0000 (07:23 +1000)]
Merge pull request #21102 from artfulrobot/ui/37
dev/user-interface#37 Reinstate jQueryUI visible focus effect in quicksearch
Eileen McNaughton [Fri, 13 Aug 2021 20:13:05 +0000 (08:13 +1200)]
Merge pull request #21124 from MegaphoneJon/fix-event-validation
fix crmValidate() not loading on event registration pages
Jon Goldberg [Fri, 13 Aug 2021 17:50:54 +0000 (13:50 -0400)]
fix crmValidate() not loading on event registration pages
Eileen McNaughton [Fri, 13 Aug 2021 05:56:17 +0000 (17:56 +1200)]
Merge pull request #21107 from MegaphoneJon/clean-override-total
delocalize total amount before passing to setOverrideTotal
Seamus Lee [Fri, 13 Aug 2021 01:22:45 +0000 (11:22 +1000)]
Merge pull request #21108 from seamuslee001/5.41
[REF] Upgrade CKEditor to 4.16.2
Seamus Lee [Thu, 12 Aug 2021 23:35:09 +0000 (09:35 +1000)]
Merge pull request #21104 from totten/5.41-typo
(NFC) release-notes - Fix typo
Seamus Lee [Thu, 12 Aug 2021 23:34:36 +0000 (09:34 +1000)]
Merge pull request #21100 from eileenmcnaughton/exceptless
dev/core#2749 remove exception when no payment processor configured when no payment processor configured
Seamus Lee [Thu, 12 Aug 2021 22:21:06 +0000 (08:21 +1000)]
[REF] Upgrade CKEditor to 4.16.2
Jon Goldberg [Thu, 12 Aug 2021 21:55:57 +0000 (17:55 -0400)]
delocalize total amount before passing to setOverrideTotal
Tim Otten [Thu, 12 Aug 2021 20:47:59 +0000 (13:47 -0700)]
(NFC) release-notes/5.39.1.md - Fix typo
Typo was autogenerated from a template. Template is also fixed.
Rich Lott / Artful Robot [Thu, 12 Aug 2021 06:56:47 +0000 (07:56 +0100)]
Reinstate jQueryUI visible focus effect in quicksearch user-interface issue 37
Eileen McNaughton [Wed, 11 Aug 2021 22:43:52 +0000 (10:43 +1200)]
dev/core#2749 remove exception when no payment processor configuredhen no payment processor configured
This is an attempt to fix a regression https://lab.civicrm.org/dev/core/-/issues/2749
when there are legitimately no payment processors assigned to a page.
I feel like the configuration screens are adequate to enforce this & having an exception like
this in the assign function is the wrong place.
The original issue is that the is_monetary box was not checked & hence the
processor wasn't assigned. This felt like asking users to understand that
a payment method when money options are configured
Eileen McNaughton [Thu, 12 Aug 2021 00:06:05 +0000 (12:06 +1200)]
Fix one test & remove 2 that covered the error message
Eileen McNaughton [Wed, 11 Aug 2021 22:28:50 +0000 (10:28 +1200)]
dev/core#2743 fix api v3 to not unnecessarily load options
Seamus Lee [Sat, 7 Aug 2021 04:46:48 +0000 (14:46 +1000)]
Merge pull request #21001 from seamuslee001/fix_utf8mb4_test
[REF] Fix utf8mb4 test in APIv4 and re-enable the altering of databas…
Seamus Lee [Mon, 2 Aug 2021 22:34:47 +0000 (08:34 +1000)]
[REF] Fix utf8mb4 test in APIv4 and re-enable the altering of database in the v3 version of the test and fix handling for first name field
CiviCRM [Sat, 7 Aug 2021 02:12:01 +0000 (02:12 +0000)]
Set version to 5.41.beta1
Tim Otten [Sat, 7 Aug 2021 02:11:16 +0000 (19:11 -0700)]
Merge pull request #21053 from eileenmcnaughton/group_odd
dev/core#2742 fix group type on group create from form
Tim Otten [Sat, 7 Aug 2021 01:57:33 +0000 (18:57 -0700)]
Merge pull request #21051 from eileenmcnaughton/allan
dev/core#2740 fix dashboard regression on links
Eileen McNaughton [Sat, 7 Aug 2021 01:14:32 +0000 (13:14 +1200)]
Merge pull request #21050 from eileenmcnaughton/notice
Tpl notice fixes
Eileen McNaughton [Sat, 7 Aug 2021 00:37:53 +0000 (12:37 +1200)]
dev/core#2742 fix group type on group create from form
Eileen McNaughton [Fri, 6 Aug 2021 23:59:50 +0000 (11:59 +1200)]
dev/core#2740 fix dashboard regression on links
Eileen McNaughton [Fri, 6 Aug 2021 23:30:49 +0000 (11:30 +1200)]
Merge pull request #21045 from colemanw/fixSearchKitTaskPermissions
SearchKit - Fix permission to access task list
Eileen McNaughton [Fri, 6 Aug 2021 22:38:59 +0000 (10:38 +1200)]
Tpl notice fixes
These fields are both conditionally assigned to the template
demeritcowboy [Fri, 6 Aug 2021 17:57:37 +0000 (13:57 -0400)]
Merge pull request #21044 from mlutfy/fixContribSymbiotic
contributor-key.yml: updates for Symbiotic
Coleman Watts [Fri, 6 Aug 2021 15:08:27 +0000 (11:08 -0400)]
SearchKit - Fix permission to access task list
This regressed in
06ea32c, as a new api action was added but permissions were not declared.
Mathieu Lutfy [Fri, 6 Aug 2021 14:57:49 +0000 (10:57 -0400)]
contributor-key.yml: updates for Symbiotic
colemanw [Fri, 6 Aug 2021 14:55:47 +0000 (10:55 -0400)]
Merge pull request #21039 from eileenmcnaughton/tok_pseudo
Reconcile tokens misnamed or missing on legacy class
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 03:17:56 +0000 (15:17 +1200)]
Reconcile tokens misnamed on legacy class
This switches to using the same metadata based record for both classes
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.