demeritcowboy [Sun, 14 Mar 2021 19:31:50 +0000 (15:31 -0400)]
fix abbreviation
Eileen McNaughton [Sun, 14 Mar 2021 01:41:10 +0000 (14:41 +1300)]
Merge pull request #19795 from MJCO/resetPathsAPI4
Add `resetPaths` as per issue #2458 #1
Mikey O'Toole [Sat, 13 Mar 2021 17:08:00 +0000 (17:08 +0000)]
Fix docblock
colemanw [Sat, 13 Mar 2021 17:03:59 +0000 (12:03 -0500)]
Merge pull request #19793 from eileenmcnaughton/pay_mem
[REF] Extract getPaymentInstrumentID
eileen [Thu, 11 Mar 2021 20:59:53 +0000 (09:59 +1300)]
[REF] Extract getPaymentInstrumentID
This allows it to be consistently accessed
Eileen McNaughton [Fri, 12 Mar 2021 19:43:05 +0000 (08:43 +1300)]
Merge pull request #19786 from eileenmcnaughton/mem4
[Ref] Remove copy and paste overkill
Mikey O'Toole [Fri, 12 Mar 2021 18:42:53 +0000 (18:42 +0000)]
Add ResetPaths API4 endpoint #2458
colemanw [Fri, 12 Mar 2021 14:55:22 +0000 (09:55 -0500)]
Merge pull request #19697 from eileenmcnaughton/setting
Enable & do single field metadata conversion for defaultContactCountry
colemanw [Fri, 12 Mar 2021 14:46:39 +0000 (09:46 -0500)]
Merge pull request #19790 from eileenmcnaughton/token
Add further test for token custom fields
colemanw [Fri, 12 Mar 2021 14:45:02 +0000 (09:45 -0500)]
Merge pull request #19789 from eileenmcnaughton/permc
[REF] getCorePermissions cleanup
Eileen McNaughton [Fri, 12 Mar 2021 09:25:58 +0000 (22:25 +1300)]
Merge pull request #19792 from civicrm/5.36
5.36
eileen [Thu, 11 Mar 2021 21:39:59 +0000 (10:39 +1300)]
[Ref] Remove copy and paste overkill
This is a previously shared function that was copied and pasted back. However in the
context of this form they don't make sense because
1) It doesn't make sense to try to maintain the integrity (via the transaction)
of the contribution & recurring contribution over & above the other
items on the form - without the memberships they don't actually have integrity
and this might have made a little more sense front end in terms
of ensuring they were committed if a payment is made but
we can expect a back office user to observe an error
2) setting the contribution id on the form here doesn't make sense as
this line is only hit for credit-card recurring contributions and
either we are doing it elsewhere anyway or we should do it nowhere - there
is no logic for 'only do this in this one obscure flow' that makes
sense back office. Front office this was likely added for an otherwise missed
scenario
Seamus Lee [Fri, 12 Mar 2021 08:38:34 +0000 (19:38 +1100)]
Merge pull request #19785 from eileenmcnaughton/mem2
[REF] Very minor simplification
Seamus Lee [Fri, 12 Mar 2021 08:36:17 +0000 (19:36 +1100)]
Merge pull request #19791 from eileenmcnaughton/memberjs
Fix rc regression - js error on autorenew checkbox
eileen [Fri, 12 Mar 2021 06:58:17 +0000 (19:58 +1300)]
Fix rc regression - js error on autorenew checkbox
This commit
https://github.com/civicrm/civicrm-core/pull/19647/commits/
cfab7c9d1dc5d1e8438131354685928cd9da3877 renamed membershipType to membershipTypeID but missed this spot,
resulting in js errors on the new membership by credit card form
eileen [Fri, 12 Mar 2021 05:38:20 +0000 (18:38 +1300)]
Add further test for token custom fields
eileen [Fri, 12 Mar 2021 04:47:16 +0000 (17:47 +1300)]
Standardise handling of administer Multiple Organizations
eileen [Fri, 12 Mar 2021 04:29:57 +0000 (17:29 +1300)]
[REF] Stop passing paramter not recognised by getCorePermissions
getCorePermissions does not accept any parameters so this stops passing them
Eileen McNaughton [Fri, 12 Mar 2021 04:04:44 +0000 (17:04 +1300)]
Merge pull request #19788 from eileenmcnaughton/per_fin_types
Financial type hook clean up and fix towards dev/core#2454 Extend financial acls view limitations to ContributionR…
eileen [Fri, 12 Mar 2021 01:00:13 +0000 (14:00 +1300)]
dev/core#2454 Extend financial acls view limitations to ContributionRecur
eileen [Fri, 12 Mar 2021 00:58:57 +0000 (13:58 +1300)]
[REF] Move financial acl permissions declaration to extension
Just some minor cleanup to use the hook
Eileen McNaughton [Fri, 12 Mar 2021 00:00:57 +0000 (13:00 +1300)]
Merge pull request #19783 from colemanw/searchActionsSpinner
SearchKit - Refactor loading actions list & support custom fields for groups
eileen [Thu, 11 Mar 2021 21:14:48 +0000 (10:14 +1300)]
[REF] Very minor simplification
ContributionParams is mostly passed in to processContribution
but a few parametrs are added to it within that function
This adds 2 of them to the passed in values for a very minor simplification.
Note that params['total_amount'] was set using order->getTotalAmount
and this will return a consistent result from anywhere in the postProcess
function (after line 1002)
Coleman Watts [Thu, 11 Mar 2021 20:09:32 +0000 (15:09 -0500)]
SearchKit - Refactor tasks list to use API callback
Eileen McNaughton [Thu, 11 Mar 2021 19:25:44 +0000 (08:25 +1300)]
Merge pull request #19782 from eileenmcnaughton/token
Remove addressee, email_greeting_id, postal_greeting_id from exposed tokens
Coleman Watts [Thu, 11 Mar 2021 19:12:56 +0000 (14:12 -0500)]
SearchKit: Support custom fields when saving smart group
Coleman Watts [Thu, 11 Mar 2021 16:12:58 +0000 (11:12 -0500)]
SearchKit - Show spinner while actions are loading
Monish Deb [Thu, 11 Mar 2021 14:04:04 +0000 (19:34 +0530)]
Merge pull request #19756 from eileenmcnaughton/mem2
[REF] Cleanup code to determine financial_type_id
eileen [Thu, 11 Mar 2021 08:57:29 +0000 (21:57 +1300)]
Remove addressee, email_greeting_id, postal_greeting_id from exposed tokens
Per discussion on https://github.com/civicrm/civicrm-core/pull/19550#issuecomment-
781597319
there appears to be agreement that supporting tokens like
addressee_id (which resolves to '{contact.individual_prefix}{ }.....')
should not be exposed / supported as they seem both unuseful and likely
to be breaky.
These were exposed unintentionally as part of a change to make them
available as WHERE filters on apiv3
https://github.com/civicrm/civicrm-core/commit/
54e389ac6565ff534b87e5e46137a57d48d6c5c8
The discussion suggests that by contrast we should
add support to hash in the token compat subscriber
Eileen McNaughton [Thu, 11 Mar 2021 09:41:15 +0000 (22:41 +1300)]
Merge pull request #19474 from mattwire/testexpiredpriceset
Make testExpiredPriceSet more realistic
Seamus Lee [Thu, 11 Mar 2021 06:22:33 +0000 (17:22 +1100)]
Merge pull request #19778 from colemanw/readonly3
Schema - add `readonly` tag to more fields
Seamus Lee [Thu, 11 Mar 2021 06:21:19 +0000 (17:21 +1100)]
Merge pull request #19761 from MegaphoneJon/financial-169
Fix batch transaction export on D8/9
Eileen McNaughton [Thu, 11 Mar 2021 05:22:26 +0000 (18:22 +1300)]
Merge pull request #19775 from mattwire/buildmembershipblockunused
Remove unused variables/assigns from buildMembershipBlock function
Eileen McNaughton [Thu, 11 Mar 2021 04:34:22 +0000 (17:34 +1300)]
Merge pull request #19741 from demeritcowboy/case-custom-nochange
dev/core#2019 - Don't create an empty activity if nothing changed when changing case custom data
Eileen McNaughton [Thu, 11 Mar 2021 04:16:46 +0000 (17:16 +1300)]
Merge pull request #19781 from civicrm/5.36
5.36
Eileen McNaughton [Wed, 10 Mar 2021 23:49:44 +0000 (12:49 +1300)]
Merge pull request #19780 from colemanw/searchTokenPopup
SearchKit - Fix token menu positioning
Coleman Watts [Wed, 10 Mar 2021 20:19:43 +0000 (15:19 -0500)]
SearchKit - Fix token menu positioning
Eileen McNaughton [Wed, 10 Mar 2021 19:46:48 +0000 (08:46 +1300)]
Merge pull request #19777 from lcdservices/dev-core-2453
dev/core#2453 cast balance due to float
Coleman Watts [Wed, 10 Mar 2021 16:23:21 +0000 (11:23 -0500)]
Schema - add `readonly` tag to more fields
Brian Shaughnessy [Wed, 10 Mar 2021 15:47:58 +0000 (10:47 -0500)]
dev/core#2453 cast balance due to float
Matthew Wire [Wed, 10 Mar 2021 12:28:12 +0000 (12:28 +0000)]
Remove unused variables/assigns from buildMembershipBlock function
Monish Deb [Wed, 10 Mar 2021 10:19:40 +0000 (15:49 +0530)]
Merge pull request #19745 from eileenmcnaughton/member
[REF] Remove now redundant code to set line item financial type
Seamus Lee [Wed, 10 Mar 2021 07:23:14 +0000 (18:23 +1100)]
Merge pull request #19774 from civicrm/5.36
5.36
Eileen McNaughton [Wed, 10 Mar 2021 04:29:31 +0000 (17:29 +1300)]
Merge pull request #19773 from demeritcowboy/safe-foreignkey
dev/core#2452 - Make upgrade to 5.36 more robust when creating foreign key
demeritcowboy [Wed, 10 Mar 2021 02:44:57 +0000 (21:44 -0500)]
make safer
Seamus Lee [Wed, 10 Mar 2021 01:52:00 +0000 (12:52 +1100)]
Merge pull request #19771 from francescbassas/patch-17
Enable translation for Contribution Ordinality options on Contribution Detail Report
Eileen McNaughton [Wed, 10 Mar 2021 01:12:20 +0000 (14:12 +1300)]
Merge pull request #19755 from eileenmcnaughton/sum_api
dev/core#2415 Add api support for aggregate without group by
Eileen McNaughton [Wed, 10 Mar 2021 01:11:41 +0000 (14:11 +1300)]
Merge pull request #19772 from francescbassas/patch-18
Enable translation for Contribution Ordinality options on Member Contribution Detail Report
Eileen McNaughton [Wed, 10 Mar 2021 00:57:49 +0000 (13:57 +1300)]
Merge pull request #19768 from demeritcowboy/grant-placeholder
dev/core#2411 - Fix placeholder text for grants.
Eileen McNaughton [Wed, 10 Mar 2021 00:56:46 +0000 (13:56 +1300)]
Merge pull request #19767 from colemanw/campaignPlaceholders
Fix incorrect placeholder text on 'Create Campaign' form
Eileen McNaughton [Wed, 10 Mar 2021 00:54:12 +0000 (13:54 +1300)]
Merge pull request #19769 from MegaphoneJon/remove-unused
[REF] remove unused code in recordFinancialAccounts
francescbassas [Tue, 9 Mar 2021 23:53:30 +0000 (00:53 +0100)]
Enable translation for Contribution Ordinality options on Member Contribution Detail Report
francescbassas [Tue, 9 Mar 2021 23:51:14 +0000 (00:51 +0100)]
Enable translation for Contribution Ordinality options on Contribution Detail Report
Seamus Lee [Tue, 9 Mar 2021 23:40:24 +0000 (10:40 +1100)]
Merge pull request #19770 from agileware/CIVICRM-1679
Include the timezone for date values in the Activity iCal
Seamus Lee [Tue, 9 Mar 2021 23:40:07 +0000 (10:40 +1100)]
Merge pull request #19762 from agileware/CIVICRM-1676
Include the timezone for date values in the Event iCal
eileen [Tue, 9 Mar 2021 22:54:17 +0000 (11:54 +1300)]
Fix test to teardown it's own mess
This business of doing cleanup in the setup is an anti-pattern and
it actually adds some internal dependency - if you
run JUST the one test (conditions probably apply) it
falls over with a 'cannot find DSN'. Rather than track that
down that weirdness we should fix the tests to
tearDown in the teardown
Justin Freeman [Tue, 9 Mar 2021 21:42:26 +0000 (08:42 +1100)]
CIVICRM-1679 Include the timezone for date values in the Activity iCal
Jon Goldberg [Tue, 9 Mar 2021 20:06:39 +0000 (15:06 -0500)]
[REF] remove unused code in recordFinancialAccounts
demeritcowboy [Tue, 9 Mar 2021 19:58:18 +0000 (14:58 -0500)]
fix placeholder
Coleman Watts [Tue, 9 Mar 2021 19:04:23 +0000 (14:04 -0500)]
Fix incorrect placeholder text on 'Create Campaign' form
Mathieu Lu [Tue, 9 Mar 2021 18:19:07 +0000 (13:19 -0500)]
Merge pull request #19732 from mlutfy/fixWpAnon
WordPress: avoid PHP notice if the anonymous user does not have any capabilities
colemanw [Tue, 9 Mar 2021 16:33:53 +0000 (11:33 -0500)]
Merge pull request #19733 from colemanw/exportUiCheckPerm
Export UI - Only present "save mapping" button to permissioned users
eileen [Mon, 8 Mar 2021 04:37:54 +0000 (17:37 +1300)]
Add api support for aggregate without group by
For example
SELECT SUM(amount) FROM civicrm_pledge
Should be doable with no group by if none is desired
Eileen McNaughton [Tue, 9 Mar 2021 01:11:53 +0000 (14:11 +1300)]
Merge pull request #19763 from civicrm/5.36
5.36 to master
Eileen McNaughton [Tue, 9 Mar 2021 01:03:18 +0000 (14:03 +1300)]
Merge pull request #19736 from colemanw/empty
Add is empty filter to search / api
Justin Freeman [Tue, 9 Mar 2021 00:00:58 +0000 (11:00 +1100)]
CIVICRM-1676 Include the timezone for date values in the Event iCal
Jon Goldberg [Mon, 8 Mar 2021 22:53:51 +0000 (17:53 -0500)]
Fix batch transaction export on D8/9
eileen [Tue, 2 Mar 2021 12:31:55 +0000 (01:31 +1300)]
Add is empty filter to search / api
This is already offered in Query
https://github.com/civicrm/civicrm-core/blob/
5db2212e2d408f4611439734db1a31ab32dced2f/CRM/Contact/BAO/Query.php#L3420-L3428
And in Report
https://github.com/civicrm/civicrm-core/blob/
c3fffe27cb8203634c7a2c047686ba3d12cc38bd/CRM/Report/Form.php#L2105-L2124
(the latter munges it in with NULL but as we often save empty strings NULL
does not alwasy work for strings)
Seamus Lee [Mon, 8 Mar 2021 21:10:52 +0000 (08:10 +1100)]
Merge pull request #19760 from civicrm/5.36
5.36
Eileen McNaughton [Mon, 8 Mar 2021 20:11:42 +0000 (09:11 +1300)]
Merge pull request #19758 from colemanw/searchKitFix
SearchKit - Fix broken update dialog and add input type float
Mathieu Lu [Mon, 8 Mar 2021 20:01:34 +0000 (15:01 -0500)]
Merge pull request #19729 from colemanw/coreExtCleanup
Fix ts() namespace in searchKit & afform extensions
Coleman Watts [Mon, 8 Mar 2021 13:03:22 +0000 (08:03 -0500)]
SearchKit - Fix broken update dialog and add input type float
Coleman Watts [Thu, 4 Mar 2021 15:37:04 +0000 (10:37 -0500)]
Fix ts() namespace in searchKit & afform extensions
eileen [Mon, 8 Mar 2021 11:03:34 +0000 (00:03 +1300)]
[REF] Cleanup code to determine financial_type_id
Financial type id is really simple on this form - it's either required or
it can be determined form the price set.
However, the code passes the financial_type_id from array to array, calculating
it in more than one place which rather hides the underlying simplicity of it.
This retrieves it using a function that does the same from anywhere in the code.
Note that if someone tried to add it before this->order is built it would
hard fail & kill a bunch of tests. this->order is built at the start of the
submit routine
Seamus Lee [Mon, 8 Mar 2021 05:23:13 +0000 (16:23 +1100)]
Merge pull request #19746 from eileenmcnaughton/mem_2
[REF] Clean up code around is_email_receipt
Seamus Lee [Mon, 8 Mar 2021 05:15:52 +0000 (16:15 +1100)]
Merge pull request #19486 from eileenmcnaughton/pddemail
dev/financial#162 Simplify isPdf code
Eileen McNaughton [Mon, 8 Mar 2021 04:42:08 +0000 (17:42 +1300)]
Merge pull request #19754 from eileenmcnaughton/api
Fix apiv4 test sloppiness
Eileen McNaughton [Mon, 8 Mar 2021 04:13:25 +0000 (17:13 +1300)]
Merge pull request #19751 from colemanw/readonly2
Add more 'readonly' tags to the schema for fields not intended to be editable by users
eileen [Mon, 8 Mar 2021 03:07:51 +0000 (16:07 +1300)]
Fix apiv4 test sloppiness
Why would we exclude e-notices from causing test fails - I suspect this
canary-killer got added a long time back & no-one noticed
Eileen McNaughton [Mon, 8 Mar 2021 02:35:35 +0000 (15:35 +1300)]
Merge pull request #19752 from colemanw/searchKitSmartGroupCodeByeBye
SearchKit - remove unused smartGroup code
Coleman Watts [Mon, 8 Mar 2021 00:32:37 +0000 (19:32 -0500)]
SearchKit - remove unused smartGroup code
Eileen McNaughton [Sun, 7 Mar 2021 22:46:00 +0000 (11:46 +1300)]
Merge pull request #19739 from colemanw/afformBreadcrumb
Afform - Show breadcrumbs appropriate to whether a form can be edited
Eileen McNaughton [Sun, 7 Mar 2021 21:12:01 +0000 (10:12 +1300)]
Merge pull request #19750 from civicrm/5.36
5.36 to master
Eileen McNaughton [Sun, 7 Mar 2021 21:11:19 +0000 (10:11 +1300)]
Merge pull request #19747 from colemanw/searchKitRemoveSelectWhenRemovingJoin
SearchKit - Fix removing all related fields from SELECT when removing a JOIN
Coleman Watts [Sun, 7 Mar 2021 21:09:10 +0000 (16:09 -0500)]
Add more 'readonly' tags to the schema for fields not intended to be editable by users
Eileen McNaughton [Sun, 7 Mar 2021 21:08:16 +0000 (10:08 +1300)]
Merge pull request #19749 from civicrm/5.36
5.36 to master
Eileen McNaughton [Sun, 7 Mar 2021 21:06:20 +0000 (10:06 +1300)]
Merge pull request #19740 from agh1/notnotnull
dev/translation#58 further regression fix: don't make group title NOT NULL even for a moment
Coleman Watts [Sun, 7 Mar 2021 02:42:35 +0000 (21:42 -0500)]
SearchKit - Fix removing all related fields from SELECT when removing a JOIN
colemanw [Sun, 7 Mar 2021 00:04:30 +0000 (19:04 -0500)]
Merge pull request #19742 from totten/master-unused
(REF) CRM_Upgrade_Form - Remove unused method getRevisionPart()
Andrew Hunt [Fri, 5 Mar 2021 22:52:15 +0000 (17:52 -0500)]
dev/translation#58 don\'t make group title NOT NULL even for a moment
eileen [Sat, 6 Mar 2021 19:56:55 +0000 (08:56 +1300)]
[REF] Clean up code around is_email_receipt
The is_email_receipt param is passed into legacyProcessRecurringContribution
but not used. It is also used to set now to receipt date which is then
only used in a loop that uses a more direct method to check
if an email receipt is used.
eileen [Sat, 6 Mar 2021 19:34:28 +0000 (08:34 +1300)]
[REF] Remove now redundant code to set line item financial type
This is now done higher up. Test adds cover for this
Eileen McNaughton [Sat, 6 Mar 2021 19:18:35 +0000 (08:18 +1300)]
Merge pull request #19642 from demeritcowboy/case-views2
dev/core#2385 and dev/core#2262 - Case db views are no longer needed
demeritcowboy [Sun, 21 Feb 2021 16:46:51 +0000 (11:46 -0500)]
case db views no longer needed
Coleman Watts [Sat, 6 Mar 2021 16:36:38 +0000 (11:36 -0500)]
SearchKit - Add breadcrumb to saved searches from search display view
Coleman Watts [Thu, 4 Mar 2021 13:30:43 +0000 (08:30 -0500)]
Afform - simplify code to check if ext enabled
Coleman Watts [Fri, 5 Mar 2021 15:32:42 +0000 (10:32 -0500)]
Afform - Show breadcrumbs appropriate to whether a form can be edited
Tim Otten [Sat, 6 Mar 2021 07:39:12 +0000 (23:39 -0800)]
(REF) CRM_Upgrade_Form - Remove unused method getRevisionPart()
demeritcowboy [Mon, 1 Mar 2021 18:45:11 +0000 (13:45 -0500)]
don't create an activity if nothing changed
Tim Otten [Fri, 5 Mar 2021 04:58:47 +0000 (20:58 -0800)]
Merge pull request #19724 from alexymik/patch-2
Update SocialNetwork.tpl Twitter Intent URL