civicrm-core.git
3 years agoFix for issue 2685
sadashiv [Fri, 9 Jul 2021 03:38:55 +0000 (09:08 +0530)]
Fix for issue 2685

3 years agoMerge pull request #20814 from seamuslee001/dev_core_2680
Eileen McNaughton [Thu, 8 Jul 2021 22:59:34 +0000 (10:59 +1200)]
Merge pull request #20814 from seamuslee001/dev_core_2680

dev/core#2680 Remove rows in the civicrm_contribution_product table t…

3 years agodev/core#2680 Remove rows in the civicrm_contribution_product table that have bad...
Seamus Lee [Thu, 8 Jul 2021 21:13:41 +0000 (07:13 +1000)]
dev/core#2680 Remove rows in the civicrm_contribution_product table that have bad product_ids in them

3 years agoSet version to 5.40.beta1
CiviCRM [Thu, 8 Jul 2021 03:42:16 +0000 (03:42 +0000)]
Set version to 5.40.beta1

3 years agoMerge pull request #20810 from totten/master-e2e-timeout
Tim Otten [Thu, 8 Jul 2021 03:39:40 +0000 (20:39 -0700)]
Merge pull request #20810 from totten/master-e2e-timeout

AssetBuilderTest - Raise threshold for timeout

3 years agoAssetBuilderTest - Raise threshold for timeout
Tim Otten [Thu, 8 Jul 2021 03:21:57 +0000 (20:21 -0700)]
AssetBuilderTest - Raise threshold for timeout

Overview
--------

Raise the threshold beforer abandoning execution of this E2E test.

Technical Details
------------------

This aims to mitigate flaky failures like the following:

Example failure: https://test.civicrm.org/job/CiviCRM-Core-Matrix/BKPROF=max,CIVIVER=5.39,SUITES=phpunit-e2e,label=bknix-tmp/9766/testReport/junit/E2E.Core/AssetBuilderTest/testInvalid/

```
E2E\Core\AssetBuilderTest::testInvalid
GuzzleHttp\Exception\ConnectException: cURL error 28: Operation timed out after 1001 milliseconds with 0 bytes received (see https://curl.haxx.se/libcurl/c/libcurl-errors.html)

/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php:200
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php:155
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php:105
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php:43
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php:28
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php:51
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php:37
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Middleware.php:29
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php:70
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Middleware.php:59
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/HandlerStack.php:71
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Client.php:351
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Client.php:162
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Client.php:182
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/tests/phpunit/E2E/Core/AssetBuilderTest.php:167
/home/jenkins/bknix-max/extern/phpunit8/phpunit8.phar:671
```

3 years agoMerge pull request #20809 from totten/master-fwd
Tim Otten [Thu, 8 Jul 2021 02:48:25 +0000 (19:48 -0700)]
Merge pull request #20809 from totten/master-fwd

Merge forward 5.39 => master

3 years agoset-version.php - Fix autocommit for 'info.xml'
Tim Otten [Thu, 8 Jul 2021 01:48:21 +0000 (18:48 -0700)]
set-version.php - Fix autocommit for 'info.xml'

The 'set-version.php' script has an option `--commit` which should commit any updated files.

Before: Fails to commit changes to `ext/*/info.xml`

After: Does ocmmit changes to `ext/*/info.xml`

3 years agorelease-notes/5.39.0.md - Add recent PR
Tim Otten [Thu, 8 Jul 2021 01:44:21 +0000 (18:44 -0700)]
release-notes/5.39.0.md - Add recent PR

3 years agorelease-notes/5.39.0.md - Random tiny edits
Tim Otten [Thu, 8 Jul 2021 01:37:23 +0000 (18:37 -0700)]
release-notes/5.39.0.md - Random tiny edits

3 years agodev/core#2659 Move group cleanup to latest release
Eileen McNaughton [Sat, 3 Jul 2021 01:16:43 +0000 (13:16 +1200)]
dev/core#2659 Move group cleanup to latest release

3 years agoMerge pull request #20803 from colemanw/addressSearchFilter
Eileen McNaughton [Thu, 8 Jul 2021 02:06:34 +0000 (14:06 +1200)]
Merge pull request #20803 from colemanw/addressSearchFilter

SearchKit - Remove automatic filter from address

3 years agoMerge pull request #20600 from ixiam/dev#SettingsTraitCheckboxes
Eileen McNaughton [Thu, 8 Jul 2021 00:29:05 +0000 (12:29 +1200)]
Merge pull request #20600 from ixiam/dev#SettingsTraitCheckboxes

Force cleanup of setting value type "checkboxes" when is empty

3 years agoMerge pull request #20764 from colemanw/multiContactRefJoins
colemanw [Wed, 7 Jul 2021 23:29:54 +0000 (19:29 -0400)]
Merge pull request #20764 from colemanw/multiContactRefJoins

SearchKit - Add ability to join on multi-select ContactRef fields

3 years agoMerge pull request #20785 from eileenmcnaughton/baseipn
colemanw [Wed, 7 Jul 2021 23:22:52 +0000 (19:22 -0400)]
Merge pull request #20785 from eileenmcnaughton/baseipn

Fix BaseIPN test to (mostly) pass invalid financials checks

3 years agoMerge pull request #20746 from colemanw/locBlockFixes
Eileen McNaughton [Wed, 7 Jul 2021 23:04:22 +0000 (11:04 +1200)]
Merge pull request #20746 from colemanw/locBlockFixes

dev/core#2676 SearchKit - Add LocBlock entity to display Event location data

3 years agoSearchKit - Remove automatic filter from address
Coleman Watts [Wed, 7 Jul 2021 22:34:57 +0000 (18:34 -0400)]
SearchKit - Remove automatic filter from address

3 years agoMerge pull request #20780 from eileenmcnaughton/pay_order
Eileen McNaughton [Wed, 7 Jul 2021 22:22:28 +0000 (10:22 +1200)]
Merge pull request #20780 from eileenmcnaughton/pay_order

Fix test set up to user Order api

3 years agoMerge pull request #20802 from civicrm/5.39
Eileen McNaughton [Wed, 7 Jul 2021 22:09:07 +0000 (10:09 +1200)]
Merge pull request #20802 from civicrm/5.39

5.39 to master

3 years agoMerge pull request #20798 from agh1/5.39.0-releasenotes-final
Eileen McNaughton [Wed, 7 Jul 2021 22:08:31 +0000 (10:08 +1200)]
Merge pull request #20798 from agh1/5.39.0-releasenotes-final

5.39.0 release notes: added late changes

3 years agoMerge pull request #20765 from colemanw/apiDeprecatePassingIdField
Eileen McNaughton [Wed, 7 Jul 2021 21:45:18 +0000 (09:45 +1200)]
Merge pull request #20765 from colemanw/apiDeprecatePassingIdField

APIv4 - Deprecate passing 'id' to basic actions

3 years agoMerge pull request #20719 from mattwire/deprecatedwarningcaller
Eileen McNaughton [Wed, 7 Jul 2021 20:44:57 +0000 (08:44 +1200)]
Merge pull request #20719 from mattwire/deprecatedwarningcaller

Add calling function to deprecatedWarning log message

3 years agoFix test set up to user Order api
Eileen McNaughton [Tue, 6 Jul 2021 07:32:32 +0000 (19:32 +1200)]
Fix test set up to user Order api

Note this includes the order api ensuring that the contribution_recur_id is passed through to
any created memberships

3 years agoMerge pull request #20797 from colemanw/reportTplFixes
Eileen McNaughton [Wed, 7 Jul 2021 20:38:13 +0000 (08:38 +1200)]
Merge pull request #20797 from colemanw/reportTplFixes

Fix undefined tpl vars in CiviReport

3 years ago5.39.0 release notes: added late changes
Andrew Hunt [Wed, 7 Jul 2021 19:36:55 +0000 (15:36 -0400)]
5.39.0 release notes: added late changes

3 years agoAdd deprecated flag to functions
Matthew Wire [Wed, 7 Jul 2021 18:39:14 +0000 (19:39 +0100)]
Add deprecated flag to functions

3 years agoAdd calling function to deprecatedWarning log message
Matthew Wire [Mon, 28 Jun 2021 08:43:02 +0000 (09:43 +0100)]
Add calling function to deprecatedWarning log message

3 years agoFix undefined tpl vars in CiviReport
Coleman Watts [Wed, 7 Jul 2021 13:44:22 +0000 (09:44 -0400)]
Fix undefined tpl vars in CiviReport

3 years agoMerge pull request #20796 from demeritcowboy/smartactlinks
colemanw [Wed, 7 Jul 2021 15:01:55 +0000 (11:01 -0400)]
Merge pull request #20796 from demeritcowboy/smartactlinks

Unused smarty variable

3 years agoMerge pull request #20795 from demeritcowboy/smartycasehlp
colemanw [Wed, 7 Jul 2021 14:00:31 +0000 (10:00 -0400)]
Merge pull request #20795 from demeritcowboy/smartycasehlp

smarty notices - New case screen - Case.hlp

3 years agoMerge pull request #20793 from eileenmcnaughton/order2
colemanw [Wed, 7 Jul 2021 13:56:25 +0000 (09:56 -0400)]
Merge pull request #20793 from eileenmcnaughton/order2

[Ref] Remove (more) unreachable code from order api

3 years agounused
demeritcowboy [Wed, 7 Jul 2021 13:12:28 +0000 (09:12 -0400)]
unused

3 years agosometimes legitimately missing
demeritcowboy [Wed, 7 Jul 2021 13:02:33 +0000 (09:02 -0400)]
sometimes legitimately missing

3 years agoFurther cleanup on order
Eileen McNaughton [Wed, 7 Jul 2021 05:49:52 +0000 (17:49 +1200)]
Further cleanup on order

Follow up to https://github.com/civicrm/civicrm-core/pull/20792
- although that can be closed if this is merged

3 years ago[REF] Remove unreachable code from order api
Eileen McNaughton [Wed, 7 Jul 2021 05:41:37 +0000 (17:41 +1200)]
[REF] Remove unreachable code from order api

3 years agoMerge pull request #18517 from JMAConsulting/financial-issue-150
Matthew Wire [Wed, 7 Jul 2021 08:30:39 +0000 (09:30 +0100)]
Merge pull request #18517 from JMAConsulting/financial-issue-150

dev/financial#150: civicrm/payment/form url got empty currency argument in backoffice live CC form

3 years agoMerge pull request #20392 from seamuslee001/ckeditor4
Eileen McNaughton [Wed, 7 Jul 2021 06:31:07 +0000 (18:31 +1200)]
Merge pull request #20392 from seamuslee001/ckeditor4

[REF] Extract CKEditor into its own core extension

3 years agoMerge pull request #20790 from eileenmcnaughton/partor
Eileen McNaughton [Wed, 7 Jul 2021 05:24:21 +0000 (17:24 +1200)]
Merge pull request #20790 from eileenmcnaughton/partor

Handle participant payment create in line item

3 years agoMerge pull request #20789 from totten/master-crmui-selecting
colemanw [Wed, 7 Jul 2021 04:48:18 +0000 (00:48 -0400)]
Merge pull request #20789 from totten/master-crmui-selecting

(REF) crmUi - Support onCrmUiSelect for using select2 as a picklist

3 years agoExtract CKEditor into its own core extension
Seamus Lee [Sat, 22 May 2021 23:03:03 +0000 (09:03 +1000)]
Extract CKEditor into its own core extension

Update civicrm_generated and shift js files into the new extension

Update to use E::path and E::url as appropriate

Add in Upgrade step to update option label to be consistant

Make changes for CKeditor 4 label now

Add in upgrade step to enable extension on upgrade

3 years agoHandle participant payment create in line item
Eileen McNaughton [Fri, 18 Jun 2021 07:02:17 +0000 (19:02 +1200)]
Handle participant payment create in line item

Remove participant payment create from order api

This is now done in the line item create & we went through to 'prove' that it works with
extra validation

3 years agoMerge pull request #20783 from JMAConsulting/issue_2681
Eileen McNaughton [Wed, 7 Jul 2021 03:13:49 +0000 (15:13 +1200)]
Merge pull request #20783 from JMAConsulting/issue_2681

dev#2861: Prevent duplicate names in mailing labels

3 years agoMerge pull request #20788 from totten/master-array-rotate
colemanw [Wed, 7 Jul 2021 01:42:29 +0000 (21:42 -0400)]
Merge pull request #20788 from totten/master-array-rotate

CRM_Utils_Array::asColumns() - Add helper to rotate a matrix (from rows to columns)

3 years agoMerge pull request #20787 from totten/master-path-unset
Eileen McNaughton [Wed, 7 Jul 2021 00:47:14 +0000 (12:47 +1200)]
Merge pull request #20787 from totten/master-path-unset

CRM_Utils_Array - Implement pathUnset() method

3 years agocrmUi - Add onCrmUiSelect for using select2 as a picklist
Tim Otten [Tue, 22 Jun 2021 02:53:34 +0000 (19:53 -0700)]
crmUi - Add onCrmUiSelect for using select2 as a picklist

3 years agoFix BaseIPN test to (mostly) pass invalid financials
Eileen McNaughton [Tue, 6 Jul 2021 22:04:27 +0000 (10:04 +1200)]
Fix BaseIPN test to (mostly) pass invalid financials

3 years agoMerge pull request #20779 from eileenmcnaughton/batch2
colemanw [Tue, 6 Jul 2021 23:25:02 +0000 (19:25 -0400)]
Merge pull request #20779 from eileenmcnaughton/batch2

 Clean up code to determine line items for membership batch entry

3 years agoCRM_Utils_Array - Add helper to rotate an array (from rows to columns)
Tim Otten [Wed, 23 Jun 2021 02:53:07 +0000 (19:53 -0700)]
CRM_Utils_Array - Add helper to rotate an array (from rows to columns)

3 years agoCRM_Utils_Array - Implement pathUnset() method
Tim Otten [Wed, 30 Jun 2021 03:12:28 +0000 (20:12 -0700)]
CRM_Utils_Array - Implement pathUnset() method

3 years agoMerge pull request #20781 from colemanw/tplFixes
demeritcowboy [Tue, 6 Jul 2021 19:32:26 +0000 (15:32 -0400)]
Merge pull request #20781 from colemanw/tplFixes

Fix undefined indexes in tpls

3 years agoClean up code to determine line items for batch entry
Eileen McNaughton [Tue, 6 Jul 2021 01:26:33 +0000 (13:26 +1200)]
Clean up code to determine line items for batch entry

This removes a chunk of weird code & further consolidates on the internal BAO_Order helper.

Note the test cover is in CRM_Batch_Form_EntryTest, which has
validateFinancials enabled

3 years agoAfform - Support implicit joins in SearchDisplay filter fields
Coleman Watts [Sun, 4 Jul 2021 00:41:57 +0000 (20:41 -0400)]
Afform - Support implicit joins in SearchDisplay filter fields

3 years agoSearchKit - Fix array filters with serialized fields
Coleman Watts [Sat, 3 Jul 2021 22:07:31 +0000 (18:07 -0400)]
SearchKit - Fix array filters with serialized fields

3 years agoSearchKit - Allow multi-valued contact ref fields to be formatted as links
Coleman Watts [Sat, 3 Jul 2021 21:47:19 +0000 (17:47 -0400)]
SearchKit - Allow multi-valued contact ref fields to be formatted as links

This handles multivalued fields by looping through each item and formatting it as a link

3 years agoPrevent duplicate names in mailing labels
Monish Deb [Tue, 6 Jul 2021 15:30:25 +0000 (21:00 +0530)]
Prevent duplicate names in mailing labels

3 years agoMerge pull request #20778 from eileenmcnaughton/batch
colemanw [Tue, 6 Jul 2021 15:22:39 +0000 (11:22 -0400)]
Merge pull request #20778 from eileenmcnaughton/batch

[REF] Tidy up param transforms

3 years agoMerge pull request #20728 from demeritcowboy/missing-end-date
colemanw [Tue, 6 Jul 2021 15:19:28 +0000 (11:19 -0400)]
Merge pull request #20728 from demeritcowboy/missing-end-date

Error when sorting case roles table by end date

3 years agoMerge pull request #20738 from eileenmcnaughton/tpl2
colemanw [Tue, 6 Jul 2021 14:55:51 +0000 (10:55 -0400)]
Merge pull request #20738 from eileenmcnaughton/tpl2

Enotice fix Remove references to savedFieldMapping in page 2 of the import

3 years agoFix undefined indexes in tpls
Coleman Watts [Tue, 6 Jul 2021 14:07:16 +0000 (10:07 -0400)]
Fix undefined indexes in tpls

3 years agoMerge pull request #20672 from eileenmcnaughton/mem_num_terms
Monish Deb [Tue, 6 Jul 2021 11:19:56 +0000 (16:49 +0530)]
Merge pull request #20672 from eileenmcnaughton/mem_num_terms

dev/membership#29 Add civicrm_line_item.membership_num_terms

3 years ago[REF] Tidy up param transforms
Eileen McNaughton [Mon, 5 Jul 2021 23:55:20 +0000 (11:55 +1200)]
[REF] Tidy up param transforms

This just moves the transforms to their own function & comments them. I have previously
added test cover which should cover this well.

The parameters used for profiles are not the 'real' parameters so this does the transform

3 years agoMerge pull request #20774 from civicrm/5.39
Seamus Lee [Mon, 5 Jul 2021 22:58:54 +0000 (08:58 +1000)]
Merge pull request #20774 from civicrm/5.39

5.39

3 years agodev/membership#29 Add civicrm_line_item.membership_num_terms
Eileen McNaughton [Sat, 19 Jun 2021 06:57:12 +0000 (18:57 +1200)]
dev/membership#29 Add civicrm_line_item.membership_num_terms

Specify table in query (no change in query meaning)

3 years agoMerge pull request #20727 from colemanw/deprecateApi4EntityLinks
Eileen McNaughton [Mon, 5 Jul 2021 22:21:29 +0000 (10:21 +1200)]
Merge pull request #20727 from colemanw/deprecateApi4EntityLinks

APIv4 - Deprecate Entity::getLinks action

3 years agoAPIv4 - Deprecate passing 'id' to basic actions and standardize update actions
Coleman Watts [Sun, 4 Jul 2021 20:55:36 +0000 (16:55 -0400)]
APIv4 - Deprecate passing 'id' to basic actions and standardize update actions

The primary_key is now known for every entity so it doesn't need to be passed
into the action classes, and both BasicUpdate and DAOUpdate can function off this key.

This accepts the old constructor arguments for backward-compatablity, for now.

3 years agoMerge pull request #20773 from alifrumin/rn5.39
Seamus Lee [Mon, 5 Jul 2021 21:18:03 +0000 (07:18 +1000)]
Merge pull request #20773 from alifrumin/rn5.39

[NFC] First Stab at 5.39 Release Notes

3 years agoMerge pull request #20770 from demeritcowboy/smartydash
colemanw [Mon, 5 Jul 2021 19:18:52 +0000 (15:18 -0400)]
Merge pull request #20770 from demeritcowboy/smartydash

smarty notice - case dashboard when no upcoming/recent cases

3 years agorelease notes 5.39 - first pass
Alice Frumin [Thu, 17 Jun 2021 18:25:54 +0000 (14:25 -0400)]
release notes 5.39 - first pass

3 years agoMerge pull request #20769 from eileenmcnaughton/acl_test
colemanw [Mon, 5 Jul 2021 16:52:04 +0000 (12:52 -0400)]
Merge pull request #20769 from eileenmcnaughton/acl_test

dev/core#2115 Move financial acl code out of v3 Contribution create

3 years agoMerge pull request #20771 from demeritcowboy/smartyrep2
Monish Deb [Mon, 5 Jul 2021 16:06:07 +0000 (21:36 +0530)]
Merge pull request #20771 from demeritcowboy/smartyrep2

smarty notice - title is only set for a list of existing report instances

3 years agoMerge pull request #20772 from demeritcowboy/smartyrep
Monish Deb [Mon, 5 Jul 2021 16:05:25 +0000 (21:35 +0530)]
Merge pull request #20772 from demeritcowboy/smartyrep

smarty notice - confirm_message is usually irrelevant in report listings

3 years agotitle is only set for a list of existing instances
demeritcowboy [Mon, 5 Jul 2021 13:10:10 +0000 (09:10 -0400)]
title is only set for a list of existing instances

3 years agosometimes it's legitimately missing
demeritcowboy [Mon, 5 Jul 2021 13:07:57 +0000 (09:07 -0400)]
sometimes it's legitimately missing

3 years agoensure var exists
demeritcowboy [Mon, 5 Jul 2021 13:02:38 +0000 (09:02 -0400)]
ensure var exists

3 years agoMerge pull request #20733 from seamuslee001/is_deleted_unit_test
colemanw [Mon, 5 Jul 2021 11:38:45 +0000 (07:38 -0400)]
Merge pull request #20733 from seamuslee001/is_deleted_unit_test

[NFC] Add in unit test to lock in the fix for the is_deleted in where…

3 years agoMerge pull request #20321 from mattwire/loggedincontactid
Monish Deb [Mon, 5 Jul 2021 10:55:41 +0000 (16:25 +0530)]
Merge pull request #20321 from mattwire/loggedincontactid

Deprecate duplicate getLoggedInContactID() function

3 years agoMerge pull request #20751 from artfulrobot/artfulrobot-fix-email-hold-reset
Seamus Lee [Mon, 5 Jul 2021 08:31:27 +0000 (18:31 +1000)]
Merge pull request #20751 from artfulrobot/artfulrobot-fix-email-hold-reset

Fix invalid defaults for Mailing.update_email_resetdate API

3 years agoMerge pull request #20681 from eileenmcnaughton/order_easy
Monish Deb [Mon, 5 Jul 2021 07:48:36 +0000 (13:18 +0530)]
Merge pull request #20681 from eileenmcnaughton/order_easy

Make Order api easier to use for default price set

3 years agoMerge pull request #20656 from eileenmcnaughton/cont_mode
Monish Deb [Mon, 5 Jul 2021 07:29:07 +0000 (12:59 +0530)]
Merge pull request #20656 from eileenmcnaughton/cont_mode

[REF] Follow up clean up - remove contribution_mode

3 years agoFix invalid defaults for Mailing.update_email_resetdate API
Rich Lott / Artful Robot [Fri, 2 Jul 2021 15:47:59 +0000 (16:47 +0100)]
Fix invalid defaults for Mailing.update_email_resetdate API

temp

3 years agodev/core#2115 Move financial acl code out of v3 Contribution create
Eileen McNaughton [Mon, 5 Jul 2021 02:35:57 +0000 (14:35 +1200)]
dev/core#2115 Move financial acl code out of v3 Contribution create

3 years ago[NFC] Add in unit test to lock in the fix for the is_deleted in where clause issue
Seamus Lee [Wed, 30 Jun 2021 21:54:05 +0000 (07:54 +1000)]
[NFC] Add in unit test to lock in the fix for the is_deleted in where clause issue

Move Unit test into its own class and use normal apiv4 wrapper rather than internal class as per Coleman

3 years agoMerge pull request #20763 from colemanw/joinIdField
Eileen McNaughton [Mon, 5 Jul 2021 01:49:42 +0000 (13:49 +1200)]
Merge pull request #20763 from colemanw/joinIdField

SearchKit - use primary_key info instead of assuming 'id'

3 years agoMerge pull request #20761 from eileenmcnaughton/mem_type
Eileen McNaughton [Mon, 5 Jul 2021 01:21:58 +0000 (13:21 +1200)]
Merge pull request #20761 from eileenmcnaughton/mem_type

dev/core#2115 Add test cover for membership type page

3 years agoMerge pull request #20755 from colemanw/afformTweaks
Seamus Lee [Mon, 5 Jul 2021 00:16:33 +0000 (10:16 +1000)]
Merge pull request #20755 from colemanw/afformTweaks

Afform - cosmetic fixes in palette panel

3 years agoAdd test cover for membership type page
Eileen McNaughton [Sun, 4 Jul 2021 03:33:46 +0000 (15:33 +1200)]
Add test cover for membership type page

3 years agoAPIv4 - Support returning join data from serialized fields
Coleman Watts [Sat, 3 Jul 2021 18:04:10 +0000 (14:04 -0400)]
APIv4 - Support returning join data from serialized fields

This allows the API to return e.g. an array of display names from a serialized contact reference field.

3 years agoAPIv4 - Remove unused backreferences from SchemaMap
Coleman Watts [Sun, 4 Jul 2021 02:05:12 +0000 (22:05 -0400)]
APIv4 - Remove unused backreferences from SchemaMap

3 years agoAPIv4 - Deprecate Entity::getLinks action
Coleman Watts [Wed, 30 Jun 2021 14:36:02 +0000 (10:36 -0400)]
APIv4 - Deprecate Entity::getLinks action

The action returns a bunch of deprecated information which is no longer needed.
The APIv4 Explorer had been using a small portion of it which was actually redundant
with existing info from getFields.

3 years agoAPIv4 - Fix saving multi-contactRef field values
Coleman Watts [Sat, 3 Jul 2021 15:14:22 +0000 (11:14 -0400)]
APIv4 - Fix saving multi-contactRef field values

3 years agoSearchKit - use primary_key info instead of assuming 'id'
Coleman Watts [Sun, 4 Jul 2021 15:18:07 +0000 (11:18 -0400)]
SearchKit - use primary_key info instead of assuming 'id'

3 years agoMerge pull request #20762 from eileenmcnaughton/mem2
colemanw [Sun, 4 Jul 2021 15:00:09 +0000 (11:00 -0400)]
Merge pull request #20762 from eileenmcnaughton/mem2

dev/core#2115 prep - Remove silly if, silly rename

3 years agoMerge pull request #20760 from eileenmcnaughton/dep
demeritcowboy [Sun, 4 Jul 2021 14:09:28 +0000 (10:09 -0400)]
Merge pull request #20760 from eileenmcnaughton/dep

Remove deprecated function

3 years agoMerge pull request #20749 from colemanw/apiPrimaryKey
Seamus Lee [Sun, 4 Jul 2021 05:52:11 +0000 (15:52 +1000)]
Merge pull request #20749 from colemanw/apiPrimaryKey

 APIv4 - Rename id_field to primary_key and make it an array

3 years agoMerge pull request #20757 from eileenmcnaughton/phone_strip
Eileen McNaughton [Sun, 4 Jul 2021 04:09:44 +0000 (16:09 +1200)]
Merge pull request #20757 from eileenmcnaughton/phone_strip

dev/core#27 Move check for phone function to a check

3 years agoRemove silly if, silly rename
Eileen McNaughton [Sun, 4 Jul 2021 04:04:45 +0000 (16:04 +1200)]
Remove silly if, silly rename

This removes an if which would only be true if civicrm_membership_type table had the
field is_reserved and it was set to true. Given condition 1 is not met, 2
cannot be met.

Also - we rename max_related to maxRelated for no-good-reason

3 years agoRemove deprecated function
Eileen McNaughton [Sun, 4 Jul 2021 03:08:00 +0000 (15:08 +1200)]
Remove deprecated function

3 years agoMerge pull request #20743 from eileenmcnaughton/option_type
colemanw [Sun, 4 Jul 2021 02:53:48 +0000 (22:53 -0400)]
Merge pull request #20743 from eileenmcnaughton/option_type

Improve api consistency on custom field creation

3 years agoAdd primaryKey info to daos
Coleman Watts [Fri, 2 Jul 2021 02:34:01 +0000 (22:34 -0400)]
Add primaryKey info to daos

3 years agoAPIv4 - Rename `id_field` to `primary_key` and make it an array
Coleman Watts [Fri, 2 Jul 2021 02:10:52 +0000 (22:10 -0400)]
APIv4 - Rename `id_field` to `primary_key` and make it an array

Some entities have a combination of primary keys instead of a single field.
This is allowed in the schema so the API needs to be able to handle it too.
Renaming it for consistency with the schema.