civicrm-core.git
3 years agoExtract getContributionObject
Eileen McNaughton [Thu, 20 May 2021 01:48:18 +0000 (13:48 +1200)]
Extract getContributionObject

3 years ago[REF] Remove now-unused parameter
Eileen McNaughton [Thu, 20 May 2021 01:37:01 +0000 (13:37 +1200)]
[REF] Remove now-unused parameter

3 years agoFix tearDown & setup to work under default test db state & leave it closer to default...
Eileen McNaughton [Thu, 20 May 2021 01:17:34 +0000 (13:17 +1200)]
Fix tearDown & setup to work under default test db state & leave it closer to default test db state

3 years agoMerge pull request #20318 from eileenmcnaughton/ppp
Seamus Lee [Thu, 20 May 2021 01:33:26 +0000 (11:33 +1000)]
Merge pull request #20318 from eileenmcnaughton/ppp

[REF] Add getter for contributionID

3 years ago[Test] Add test cover for contribution tokens in pdf letter
eileen [Thu, 29 Apr 2021 05:40:32 +0000 (17:40 +1200)]
[Test] Add test cover for contribution tokens in pdf letter

3 years agoMerge pull request #20345 from eileenmcnaughton/mem_move
Seamus Lee [Thu, 20 May 2021 00:56:06 +0000 (10:56 +1000)]
Merge pull request #20345 from eileenmcnaughton/mem_move

[REF] Make previous unshared function protected & Remove hard-coded params

3 years agoMerge pull request #20330 from mattwire/fixpaymentformstest
Seamus Lee [Thu, 20 May 2021 00:54:02 +0000 (10:54 +1000)]
Merge pull request #20330 from mattwire/fixpaymentformstest

Fix form params for testEventPaymentForms

3 years agoMerge pull request #20352 from seamuslee001/test_credit_card_validation
Seamus Lee [Thu, 20 May 2021 00:34:37 +0000 (10:34 +1000)]
Merge pull request #20352 from seamuslee001/test_credit_card_validation

[NFC] Add in unit tests of credit card validation rules

3 years agoMerge pull request #20351 from seamuslee001/update_pear_finance_creditcard
Seamus Lee [Thu, 20 May 2021 00:09:05 +0000 (10:09 +1000)]
Merge pull request #20351 from seamuslee001/update_pear_finance_creditcard

[REF] Update Pear Validate Finance CreditCard to use latest tagged re…

3 years agoFix Distmaker building by ensuring we are rsyncing from the right folder
Seamus Lee [Wed, 19 May 2021 23:48:46 +0000 (09:48 +1000)]
Fix Distmaker building by ensuring we are rsyncing from the right folder

3 years agoMerge pull request #20340 from eileenmcnaughton/schema2
Seamus Lee [Wed, 19 May 2021 23:07:50 +0000 (09:07 +1000)]
Merge pull request #20340 from eileenmcnaughton/schema2

Fix extraneous white space in generated sql

3 years agoMerge pull request #20278 from aydun/name_custom_css
Seamus Lee [Wed, 19 May 2021 23:01:56 +0000 (09:01 +1000)]
Merge pull request #20278 from aydun/name_custom_css

Give the custom css file a 'name' to make it easier to manipulate in hook_civicrm_alterBundle()

3 years agoMerge pull request #20346 from eileenmcnaughton/confirm
Seamus Lee [Wed, 19 May 2021 22:55:33 +0000 (08:55 +1000)]
Merge pull request #20346 from eileenmcnaughton/confirm

[REF] Make previously unshared function protected

3 years ago[NFC] Add in unit tests of credit card validation rules
Seamus Lee [Wed, 19 May 2021 22:52:17 +0000 (08:52 +1000)]
[NFC] Add in unit tests of credit card validation rules

3 years ago[REF] Update Pear Validate Finance CreditCard to use latest tagged release that now...
Seamus Lee [Wed, 19 May 2021 22:27:41 +0000 (08:27 +1000)]
[REF] Update Pear Validate Finance CreditCard to use latest tagged release that now includes the improved mastercard 2bin regex

3 years agoMerge pull request #20319 from eileenmcnaughton/pp
Seamus Lee [Wed, 19 May 2021 21:43:33 +0000 (07:43 +1000)]
Merge pull request #20319 from eileenmcnaughton/pp

Remove extraneous debug

3 years agoMerge pull request #20347 from demeritcowboy/pass-compare
Seamus Lee [Wed, 19 May 2021 21:40:19 +0000 (07:40 +1000)]
Merge pull request #20347 from demeritcowboy/pass-compare

dev/core#2613 - Replace deprecated function in useradd task

3 years ago[REF] Make previously unshared function protected
Eileen McNaughton [Wed, 19 May 2021 09:28:51 +0000 (21:28 +1200)]
[REF] Make previously unshared function protected

This clarifies that it is not used outside core - which we
know as it was only just moved here 5187a13c4d0e4278bb9b18f9fb327b2407766dff

3 years agoswitch from deprecated function
demeritcowboy [Wed, 19 May 2021 13:11:06 +0000 (09:11 -0400)]
switch from deprecated function

3 years agoEnsure that we only replace entity reference fields and add unit test
Seamus Lee [Wed, 19 May 2021 09:25:40 +0000 (19:25 +1000)]
Ensure that we only replace entity reference fields and add unit test

3 years agoAdd in unit test of the submit action and re-work as per feedback from coleman
Seamus Lee [Mon, 17 May 2021 02:45:14 +0000 (12:45 +1000)]
Add in unit test of the submit action and re-work as per feedback from coleman

3 years agoRework the listeners so that they are called on the basis of each entitiy rather...
Seamus Lee [Mon, 10 May 2021 09:26:39 +0000 (19:26 +1000)]
Rework the listeners so that they are called on the basis of each entitiy rather than just once. Also extract weight function out and make improvements following Coleman's review and add tests

3 years agoWIP Entity Reference Submission fields
Seamus Lee [Thu, 6 May 2021 08:34:03 +0000 (18:34 +1000)]
WIP Entity Reference Submission fields

3 years ago[REF] Remove hard-coded params
Eileen McNaughton [Wed, 19 May 2021 09:21:22 +0000 (21:21 +1200)]
[REF] Remove hard-coded params

3 years agoMerge pull request #20301 from eileenmcnaughton/mem_move
Seamus Lee [Wed, 19 May 2021 05:56:40 +0000 (15:56 +1000)]
Merge pull request #20301 from eileenmcnaughton/mem_move

[REF] Remove unused parameters

3 years agoMerge pull request #20344 from civicrm/5.38
Eileen McNaughton [Wed, 19 May 2021 02:54:30 +0000 (14:54 +1200)]
Merge pull request #20344 from civicrm/5.38

5.38

3 years agoMerge pull request #20274 from agileware/CIVICRM-1737
Seamus Lee [Wed, 19 May 2021 01:18:55 +0000 (11:18 +1000)]
Merge pull request #20274 from agileware/CIVICRM-1737

Create User Record now hides the Password field and uses the check isUserRegistrationPermitted - which prevents Administrators from setting passwords for new Users

3 years agoMerge pull request #20307 from colemanw/searchTaskHook
Eileen McNaughton [Wed, 19 May 2021 00:19:33 +0000 (12:19 +1200)]
Merge pull request #20307 from colemanw/searchTaskHook

SearchKit - Rename crmSearchActions module to crmSearchTasks & add hook

3 years agoSeparate checks for 0.0 and 0
Robert J. Lang [Wed, 19 May 2021 00:18:14 +0000 (17:18 -0700)]
Separate checks for 0.0 and 0

3 years agoMerge pull request #20343 from seamuslee001/nfc_tiered_test_timecop
Tim Otten [Wed, 19 May 2021 00:10:00 +0000 (17:10 -0700)]
Merge pull request #20343 from seamuslee001/nfc_tiered_test_timecop

[NFC] Remove timecop function references from Cache Tiered Test

3 years agoCIVICRM-1737 Create User Record now hides the Password field and uses the check isUse...
Justin Freeman [Wed, 12 May 2021 21:31:44 +0000 (07:31 +1000)]
CIVICRM-1737 Create User Record now hides the Password field and uses the check isUserRegistrationPermitted - which prevents Administrators from setting passwords for new Users

3 years ago[NFC] Remove timecop function references from Cache Tiered Test
Seamus Lee [Tue, 18 May 2021 22:38:08 +0000 (08:38 +1000)]
[NFC] Remove timecop function references from Cache Tiered Test

3 years agoFix mandatory keys check fail for value of float 0.0
Robert J. Lang [Tue, 18 May 2021 22:26:41 +0000 (15:26 -0700)]
Fix mandatory keys check fail for value of float 0.0

3 years agoMerge pull request #20341 from colemanw/greenwichLinkColor
Eileen McNaughton [Tue, 18 May 2021 21:59:47 +0000 (09:59 +1200)]
Merge pull request #20341 from colemanw/greenwichLinkColor

dev/core#2403 - Change Greenwich link color from gray to blue

3 years agoMerge pull request #20239 from eileenmcnaughton/act
demeritcowboy [Tue, 18 May 2021 20:53:10 +0000 (16:53 -0400)]
Merge pull request #20239 from eileenmcnaughton/act

[REF] Cleanup BAO_ActionSchedule::getlist() signature

3 years agodev/core#2403 - Change Greenwich link color from gray to blue
Coleman Watts [Tue, 18 May 2021 19:52:05 +0000 (15:52 -0400)]
dev/core#2403 - Change Greenwich link color from gray to blue

Fixes dev/core#2403

3 years agoFix extraneous white space in generated sql
Eileen McNaughton [Tue, 18 May 2021 04:06:00 +0000 (16:06 +1200)]
Fix extraneous white space in generated sql

- trailing space when comment is not declared for a db table
- spaces before arguments that don't exist
- extra lines

Schema.tpl whitespace overhaul

Note I tried regenerating civicrm.mysql with this & it looked good - jenkins can
pass judgement too...

I also tried regenerating the sql in search_kit but I hit what seems to me to be
an unreleated regression - ie search_kit generates
 ROW_FORMAT=DYNAMIC

With my version (lastest from master) of civix I get ENGINE = INNODB but
not the ROW_FORMAT

3 years agoMerge pull request #20336 from colemanw/searchKitUseDefaultPagerSize
Eileen McNaughton [Tue, 18 May 2021 06:05:27 +0000 (18:05 +1200)]
Merge pull request #20336 from colemanw/searchKitUseDefaultPagerSize

SearchKit - Use default_pager_size setting

3 years agoMerge pull request #20337 from totten/master-field-dao
Eileen McNaughton [Tue, 18 May 2021 06:05:02 +0000 (18:05 +1200)]
Merge pull request #20337 from totten/master-field-dao

(REF) Regen CRM/Core/DAO/CustomField.php

3 years ago(REF) Regen CRM/Core/DAO/CustomField.php
Tim Otten [Tue, 18 May 2021 04:01:06 +0000 (21:01 -0700)]
(REF) Regen CRM/Core/DAO/CustomField.php

Before: The committed DAO doesn't match the generated DAO.

After: The commited DAO matches the generated DAO.

Technical Details: This DAO file grew slightly stale following 0388de0d6435161344c9483066765e7a9ca65dfe.

3 years agoMerge pull request #20333 from agileware/CIVICRM-1732
Eileen McNaughton [Tue, 18 May 2021 03:00:33 +0000 (15:00 +1200)]
Merge pull request #20333 from agileware/CIVICRM-1732

Fix case sensitive parameter for call to getCustomFieldTokens

3 years agoSearchKit - Use default_pager_size setting
Coleman Watts [Tue, 18 May 2021 02:26:50 +0000 (22:26 -0400)]
SearchKit - Use default_pager_size setting

3 years agoMerge pull request #20332 from colemanw/links_callback
Seamus Lee [Tue, 18 May 2021 00:13:14 +0000 (10:13 +1000)]
Merge pull request #20332 from colemanw/links_callback

Core_DAO - fire links_callback for all entities

3 years agoMerge pull request #20285 from colemanw/cke5Fix
Seamus Lee [Mon, 17 May 2021 22:55:44 +0000 (08:55 +1000)]
Merge pull request #20285 from colemanw/cke5Fix

Fix CKEditor5 link editing in modal dialog

3 years agoMerge pull request #20210 from eileenmcnaughton/cancel
Seamus Lee [Mon, 17 May 2021 22:41:45 +0000 (08:41 +1000)]
Merge pull request #20210 from eileenmcnaughton/cancel

Fix old-ish regression on paypal standard self-service cancel links

3 years agoMerge pull request #20243 from eileenmcnaughton/group2
Seamus Lee [Mon, 17 May 2021 22:41:15 +0000 (08:41 +1000)]
Merge pull request #20243 from eileenmcnaughton/group2

[Ref] remove redundant call to clearGroupContactCache

3 years agoMerge pull request #20326 from mattwire/payjunctiondopayment
Seamus Lee [Mon, 17 May 2021 22:36:58 +0000 (08:36 +1000)]
Merge pull request #20326 from mattwire/payjunctiondopayment

Convert payJunction to doPayment

3 years agoMerge pull request #20325 from mattwire/firstdatadopayment
Seamus Lee [Mon, 17 May 2021 22:36:48 +0000 (08:36 +1000)]
Merge pull request #20325 from mattwire/firstdatadopayment

Convert FirstData to doPayment

3 years agoMerge pull request #20324 from mattwire/elavondopayment
Seamus Lee [Mon, 17 May 2021 22:36:30 +0000 (08:36 +1000)]
Merge pull request #20324 from mattwire/elavondopayment

Convert elavon to doPayment

3 years agoMerge pull request #20327 from mattwire/realexdopayment
Seamus Lee [Mon, 17 May 2021 22:36:10 +0000 (08:36 +1000)]
Merge pull request #20327 from mattwire/realexdopayment

Convert Realex to doPayment

3 years agoMerge pull request #20328 from mattwire/payflowprodopayment
Seamus Lee [Mon, 17 May 2021 22:21:00 +0000 (08:21 +1000)]
Merge pull request #20328 from mattwire/payflowprodopayment

Convert payflowpro to doPayment

3 years agoCore_DAO - fire links_callback for all entities even if they don't explicitly declare...
Coleman Watts [Mon, 17 May 2021 22:12:30 +0000 (18:12 -0400)]
Core_DAO - fire links_callback for all entities even if they don't explicitly declare links

CRM_Core_DAO has a fallback function for entities with no foreign key fields.
Previously, that function did not call createReferenceColumns or fire links_callback

3 years agoMerge pull request #20323 from mattwire/ewaydopayment
Eileen McNaughton [Mon, 17 May 2021 22:11:55 +0000 (10:11 +1200)]
Merge pull request #20323 from mattwire/ewaydopayment

Convert eway to doPayment

3 years agoMerge pull request #20329 from highfalutin/patch-6
Eileen McNaughton [Mon, 17 May 2021 20:41:43 +0000 (08:41 +1200)]
Merge pull request #20329 from highfalutin/patch-6

Correct copy-paste error in CustomField schema

3 years agoFix form params for testEventPaymentForms
Matthew Wire [Mon, 17 May 2021 20:27:45 +0000 (21:27 +0100)]
Fix form params for testEventPaymentForms

3 years agoMerge pull request #20322 from mattwire/authnetdopayment
Eileen McNaughton [Mon, 17 May 2021 20:13:30 +0000 (08:13 +1200)]
Merge pull request #20322 from mattwire/authnetdopayment

Convert AuthorizeNet to doPayment()

3 years agoFix test to support invalidate change
Eileen McNaughton [Fri, 14 May 2021 02:02:00 +0000 (14:02 +1200)]
Fix test to support invalidate change

3 years ago[Ref] remove redundant call to clearGroupContactCache
eileen [Thu, 6 May 2021 06:57:08 +0000 (18:57 +1200)]
[Ref] remove redundant call to clearGroupContactCache

This code does a clear on the cache and then calls the api which will eventually
call load(). Load ALSO clears the cache so this seems redundant.

However, there are a couple of places where add() is called from where it might
serve to force the rebuild due to changes to group make up. In general we have switched
to invalidating and letting the rebuild-on-demand do it's thing to allow
things like crons or lack of need for the group to reduce to browser demand.
So, I think that by switching to invalidating rather than rebuilding
we can remove this potentially locky line from GroupContactCache::add()

3 years agoMerge pull request #20309 from jmcclelland/profile-county
Eileen McNaughton [Mon, 17 May 2021 19:36:58 +0000 (07:36 +1200)]
Merge pull request #20309 from jmcclelland/profile-county

get county fields populated via api call

3 years agoMerge pull request #20303 from totten/master-extver-xml
colemanw [Mon, 17 May 2021 19:22:43 +0000 (15:22 -0400)]
Merge pull request #20303 from totten/master-extver-xml

dev/release#17 - Synchronize version#s for core and core-extensions

3 years agoMerge pull request #20269 from colemanw/bulkSave
colemanw [Mon, 17 May 2021 18:48:22 +0000 (14:48 -0400)]
Merge pull request #20269 from colemanw/bulkSave

APIv4 - Save custom fields in bulk

3 years agoCorrect copy-paste error in CustomField schema
highfalutin [Mon, 17 May 2021 17:45:19 +0000 (10:45 -0700)]
Correct copy-paste error in CustomField schema

3 years agoConvert payflowpro to doPayment
Matthew Wire [Mon, 17 May 2021 15:23:55 +0000 (16:23 +0100)]
Convert payflowpro to doPayment

3 years agoConvert Realex to doPayment
Matthew Wire [Mon, 17 May 2021 15:31:38 +0000 (16:31 +0100)]
Convert Realex to doPayment

3 years agoConvert payJunction to doPayment
Matthew Wire [Mon, 17 May 2021 15:29:50 +0000 (16:29 +0100)]
Convert payJunction to doPayment

3 years agoConvert FirstData to doPayment
Matthew Wire [Mon, 17 May 2021 15:27:57 +0000 (16:27 +0100)]
Convert FirstData to doPayment

3 years agoConvert elavon to doPayment
Matthew Wire [Mon, 17 May 2021 15:26:42 +0000 (16:26 +0100)]
Convert elavon to doPayment

3 years agoConvert eway to doPayment
Matthew Wire [Mon, 17 May 2021 15:20:31 +0000 (16:20 +0100)]
Convert eway to doPayment

3 years agoConvert authorizenet to doPayment
Matthew Wire [Mon, 17 May 2021 15:11:25 +0000 (16:11 +0100)]
Convert authorizenet to doPayment

3 years agoMerge pull request #20273 from seamuslee001/report_default_pager
demeritcowboy [Mon, 17 May 2021 13:22:22 +0000 (09:22 -0400)]
Merge pull request #20273 from seamuslee001/report_default_pager

[REF] Make use of recently added default pager size setting in Reports

3 years agoMerge pull request #20313 from eileenmcnaughton/mem_move2
demeritcowboy [Mon, 17 May 2021 12:48:11 +0000 (08:48 -0400)]
Merge pull request #20313 from eileenmcnaughton/mem_move2

[REF] Duplicate & deprecate processMembership

3 years agoMerge pull request #20320 from eileenmcnaughton/managed
Seamus Lee [Mon, 17 May 2021 08:39:26 +0000 (18:39 +1000)]
Merge pull request #20320 from eileenmcnaughton/managed

Add unit test for #20144

3 years agoMerge pull request #19840 from MikeyMJCO/patch-7
Seamus Lee [Mon, 17 May 2021 08:00:10 +0000 (18:00 +1000)]
Merge pull request #19840 from MikeyMJCO/patch-7

Explicitly throw an error/status bounce on Edit/New if no types.

3 years ago[REF] Make use of recently added default pager size setting in Reports
Seamus Lee [Tue, 11 May 2021 23:56:09 +0000 (09:56 +1000)]
[REF] Make use of recently added default pager size setting in Reports

Update code as per feedback from Dave D

3 years agoAdd unit test for #20144
Eileen McNaughton [Mon, 17 May 2021 06:56:40 +0000 (18:56 +1200)]
Add unit test for #20144

3 years ago[REF] Add getter for contributionID
Eileen McNaughton [Mon, 17 May 2021 05:09:57 +0000 (17:09 +1200)]
[REF] Add getter for contributionID

3 years agoRemove extraneous debug
Eileen McNaughton [Mon, 17 May 2021 05:19:29 +0000 (17:19 +1200)]
Remove extraneous debug

We added this a while back when we were getting reports of an error that
we couldn't track down. We never got feedback of these lines appearing in the
logs and the error appears to be otherwise solved so
I think the debug adds more confusion & has not proven helpful

3 years agoMerge pull request #20316 from eileenmcnaughton/ppp
Seamus Lee [Mon, 17 May 2021 04:48:41 +0000 (14:48 +1000)]
Merge pull request #20316 from eileenmcnaughton/ppp

[REF] Switch to using getContributionRecurID function, remove now unused param

3 years agoMerge pull request #20281 from colemanw/afformDragDrop
Seamus Lee [Mon, 17 May 2021 04:46:48 +0000 (14:46 +1000)]
Merge pull request #20281 from colemanw/afformDragDrop

Afform drag n drop fixes

3 years agoMerge pull request #20317 from eileenmcnaughton/pp
Seamus Lee [Mon, 17 May 2021 04:33:56 +0000 (14:33 +1000)]
Merge pull request #20317 from eileenmcnaughton/pp

[REF] Fully remove ids variable from paypal std

3 years agoMerge pull request #20302 from totten/master-extver-ui
Eileen McNaughton [Mon, 17 May 2021 03:54:37 +0000 (15:54 +1200)]
Merge pull request #20302 from totten/master-extver-ui

(dev/release#17) Extension UI - Show developmental icon for alpha/beta-stage extensions

3 years agoMerge pull request #20310 from eileenmcnaughton/group_lock
Eileen McNaughton [Mon, 17 May 2021 02:54:12 +0000 (14:54 +1200)]
Merge pull request #20310 from eileenmcnaughton/group_lock

Cleanup tracking on group.load

3 years agoMerge pull request #20081 from totten/master-authx-defaults
Eileen McNaughton [Mon, 17 May 2021 02:27:48 +0000 (14:27 +1200)]
Merge pull request #20081 from totten/master-authx-defaults

authx - Accept API keys by default

3 years agoMerge pull request #20229 from pradpnayak/usercreate
Eileen McNaughton [Mon, 17 May 2021 02:27:30 +0000 (14:27 +1200)]
Merge pull request #20229 from pradpnayak/usercreate

Activate user when no activation is required

3 years agoFix self-service recurring link on dashboard
eileen [Mon, 3 May 2021 05:18:12 +0000 (17:18 +1200)]
Fix self-service recurring link on dashboard

This picks up on two of the issues that were blocking on
https://github.com/civicrm/civicrm-core/pull/18787 and
https://github.com/civicrm/civicrm-core/pull/18196
(but does not solve all of them). It

1) adds the basis for unit test cover and
2) separates the function for retrieving links
for self-service from back office user.

I think there is still some jumbling together of these concepts but
as long as we are careful to extend the tests as we extend the logic...

This fixes what I suspect is an oldish regression whereby the cancel link
for paypal std users was wrong

3 years agoMerge pull request #20214 from ixiam/dev#issue_2584
Eileen McNaughton [Mon, 17 May 2021 02:15:16 +0000 (14:15 +1200)]
Merge pull request #20214 from ixiam/dev#issue_2584

Separates the default language for contacts from the site language

3 years agoImprove unit test on rendered urls
eileen [Mon, 3 May 2021 04:18:06 +0000 (16:18 +1200)]
Improve unit test on rendered urls

3 years agoAPIv4 - Use bulk method for saving custom fields
Coleman Watts [Tue, 11 May 2021 16:34:05 +0000 (12:34 -0400)]
APIv4 - Use bulk method for saving custom fields

Renames the prototype bulkSave => writeRecords to follow the convention now in APIv4 and CRM_Core_DAO

3 years agoAPIv4 - Default to saving and deleting DAO records in bulk
Coleman Watts [Tue, 11 May 2021 16:22:48 +0000 (12:22 -0400)]
APIv4 - Default to saving and deleting DAO records in bulk

This adds new writeRecords() and deleteRecords() methods
to CRM_Core_DAO which can be overridden by DAOs who wish to optimize.

3 years ago[REF] Fully remove ids variable from paypal std
Eileen McNaughton [Mon, 17 May 2021 02:04:40 +0000 (14:04 +1200)]
[REF] Fully remove ids variable from paypal std

The ids variable is no longer used - bye

3 years agoExtension page markup tweaks
Coleman Watts [Mon, 17 May 2021 01:54:55 +0000 (21:54 -0400)]
Extension page markup tweaks

3 years agoDuplicate & deprecate processMembership
Eileen McNaughton [Sun, 16 May 2021 02:01:49 +0000 (14:01 +1200)]
Duplicate & deprecate processMembership

Function only called from one place + tests. Duplicate to where it is
called & deprecated as it seems civimobile may be using this
(in an unsupported way but we shouldn't actively break it since we are aware of that)

3 years ago[REF] Switch to using getContributionRecurID function, remove now unused param
Eileen McNaughton [Mon, 17 May 2021 01:49:24 +0000 (13:49 +1200)]
[REF] Switch to using getContributionRecurID function, remove now unused param

This is a follow up to https://github.com/civicrm/civicrm-core/pull/20294
- getContributionRecurID now always has the id so we don't need to pass it around
in the ids array

3 years agoCleanup tracking on group.load
Eileen McNaughton [Sat, 15 May 2021 01:27:08 +0000 (13:27 +1200)]
Cleanup tracking on group.load

1) deprecate force parameter
2) ditch the static & let the db lookups speak for themselves

The force paramter seems to mostly be about the static & probably only exists to support tests.
The static doesn't make sense now because either they group needs loading or it doesn't.
The fact the process might have tried and succeeded or failed before doesn't need
to be recorded in the static

Cleanup up progress tracking in Group::load

Fix test to do things in a logical order so contacts exist when the group is created

3 years agoMerge pull request #20314 from mattwire/contactdetailacl
demeritcowboy [Sun, 16 May 2021 15:23:55 +0000 (11:23 -0400)]
Merge pull request #20314 from mattwire/contactdetailacl

Switch to non deprecated buildPermissionClause() for contact detail report

3 years agoMerge pull request #20209 from eileenmcnaughton/qfail
Matthew Wire [Sun, 16 May 2021 14:04:47 +0000 (15:04 +0100)]
Merge pull request #20209 from eileenmcnaughton/qfail

Do not error on view contribution recur if not displaying contributions

3 years agoMerge pull request #20300 from eileenmcnaughton/pp
Matthew Wire [Sun, 16 May 2021 14:03:51 +0000 (15:03 +0100)]
Merge pull request #20300 from eileenmcnaughton/pp

dev/core#2593 stop calling loadRelatedObjects / fix for bug

3 years agoMerge pull request #20294 from eileenmcnaughton/ppp
Matthew Wire [Sun, 16 May 2021 14:00:35 +0000 (15:00 +0100)]
Merge pull request #20294 from eileenmcnaughton/ppp

[REF] Provide standardised methods to get recurring contribution id & object

3 years agoMerge pull request #20211 from eileenmcnaughton/reorg
Matthew Wire [Sun, 16 May 2021 13:53:00 +0000 (14:53 +0100)]
Merge pull request #20211 from eileenmcnaughton/reorg

[REF] Reverse if statement

3 years agoMerge pull request #20205 from eileenmcnaughton/dep_pend
Matthew Wire [Sun, 16 May 2021 13:35:30 +0000 (14:35 +0100)]
Merge pull request #20205 from eileenmcnaughton/dep_pend

Remove deprecation of order-must-be-pending