civicrm-core.git
3 years agoShow 'Pay Now' on user dashboard for partially paid contributions
Jon Goldberg [Fri, 21 May 2021 15:10:47 +0000 (11:10 -0400)]
Show 'Pay Now' on user dashboard for partially paid contributions

3 years agoMerge pull request #20102 from seamuslee001/d8_mailing_urls
Eileen McNaughton [Wed, 26 May 2021 21:33:27 +0000 (09:33 +1200)]
Merge pull request #20102 from seamuslee001/d8_mailing_urls

[REF] Fix issue where by mailing urls were always stuck in the origin…

3 years agoMerge pull request #20129 from larssandergreen/apply-mailing-tracking-only-to-a-urls
Eileen McNaughton [Wed, 26 May 2021 08:20:15 +0000 (20:20 +1200)]
Merge pull request #20129 from larssandergreen/apply-mailing-tracking-only-to-a-urls

dev/mailing#95 Only track <a> urls in Flexmailer for HTML emails

3 years agoMerge pull request #20415 from eileenmcnaughton/tax_test
Seamus Lee [Wed, 26 May 2021 04:14:59 +0000 (14:14 +1000)]
Merge pull request #20415 from eileenmcnaughton/tax_test

Test - fix contributionTest to validate contributions

3 years agoMerge pull request #20422 from eileenmcnaughton/ppp
Seamus Lee [Wed, 26 May 2021 04:13:27 +0000 (14:13 +1000)]
Merge pull request #20422 from eileenmcnaughton/ppp

dev/core#2593 Fully remove loadRelatedObjects from PaypalExpress

3 years agoMerge pull request #20426 from eileenmcnaughton/tolerate_tax
Seamus Lee [Wed, 26 May 2021 02:53:23 +0000 (12:53 +1000)]
Merge pull request #20426 from eileenmcnaughton/tolerate_tax

Test fixes

3 years agoTest fixes
Eileen McNaughton [Wed, 26 May 2021 00:35:30 +0000 (12:35 +1200)]
Test fixes

This improves cleanup in one class & in another makes it accept tax_amount = 0
rather than requiring it to be NULL. In general it's better for us to return
and save 0 so this makes the test tolerate those changes

3 years agoMerge pull request #20423 from eileenmcnaughton/ppp1
Seamus Lee [Tue, 25 May 2021 23:49:39 +0000 (09:49 +1000)]
Merge pull request #20423 from eileenmcnaughton/ppp1

[REF] Paypal pro - remove call to load contact record

3 years ago[REF] Paypal pro - remove call to load contact record
Eileen McNaughton [Tue, 25 May 2021 21:57:34 +0000 (09:57 +1200)]
[REF] Paypal pro - remove call to load contact record

This removes a look up since we are going to use the contribution contact id & all we are doing
is logging warning if it has changed

3 years agodev/core#2593 Fully remove loadRelatedObjects from PaypalExpress
Eileen McNaughton [Tue, 25 May 2021 21:43:58 +0000 (09:43 +1200)]
dev/core#2593 Fully remove loadRelatedObjects from PaypalExpress

3 years agoMerge pull request #20412 from eileenmcnaughton/ppp
Seamus Lee [Tue, 25 May 2021 21:37:18 +0000 (07:37 +1000)]
Merge pull request #20412 from eileenmcnaughton/ppp

[REF] Stop passing unneed params to the recur function

3 years agoMerge pull request #20417 from mattwire/payjunctionsetparam
Eileen McNaughton [Tue, 25 May 2021 19:38:43 +0000 (07:38 +1200)]
Merge pull request #20417 from mattwire/payjunctionsetparam

Remove unused functions from payJunction

3 years agoMerge pull request #20418 from mattwire/dummynoparams
Eileen McNaughton [Tue, 25 May 2021 19:37:55 +0000 (07:37 +1200)]
Merge pull request #20418 from mattwire/dummynoparams

Remove unused variable on dummy processor

3 years agoMerge pull request #20306 from aydun/api_case_defaults
Eileen McNaughton [Tue, 25 May 2021 19:31:42 +0000 (07:31 +1200)]
Merge pull request #20306 from aydun/api_case_defaults

Add defaults for APIv4 Case create

3 years agoRemove unused variable on dummy processor
Matthew Wire [Tue, 25 May 2021 15:21:55 +0000 (16:21 +0100)]
Remove unused variable on dummy processor

3 years agoRemove unused functions from payJunction
Matthew Wire [Tue, 25 May 2021 15:17:38 +0000 (16:17 +0100)]
Remove unused functions from payJunction

3 years agoAPIv4 - Fix Case conformance test
Coleman Watts [Tue, 25 May 2021 12:09:49 +0000 (08:09 -0400)]
APIv4 - Fix Case conformance test

Now that creator_id has a default value it can also be marked as required.
Updating TestCreationParameterProvider to supply a FK before the default value
fixes the problem with user_contact_id in a test with no logged-in user.

3 years agoMerge pull request #20401 from vingle/master
colemanw [Tue, 25 May 2021 10:57:04 +0000 (06:57 -0400)]
Merge pull request #20401 from vingle/master

Revised fix for menu/UI issues for Joomla 4.0

3 years agoTest - fix contributionTest to validate contributions
Eileen McNaughton [Tue, 25 May 2021 09:52:53 +0000 (21:52 +1200)]
Test - fix contributionTest to validate contributions

Still skipping tests that need more work to avoid malformed
financial entities

3 years agoMerge pull request #20414 from MikeyMJCO/patch-7
Eileen McNaughton [Tue, 25 May 2021 10:14:41 +0000 (22:14 +1200)]
Merge pull request #20414 from MikeyMJCO/patch-7

Describe logic behind placement of `invalidateRouteCache`

3 years agoDescribe logic behind placement of `invalidateRouteCache`
Mikey O'Toole [Tue, 25 May 2021 08:32:33 +0000 (09:32 +0100)]
Describe logic behind placement of `invalidateRouteCache`

3 years ago[REF] Stop passing unneed params to the recur function
Eileen McNaughton [Tue, 25 May 2021 06:37:19 +0000 (18:37 +1200)]
[REF] Stop passing unneed params to the recur function

3 years agoMerge pull request #20411 from eileenmcnaughton/ppp2
Eileen McNaughton [Tue, 25 May 2021 06:33:18 +0000 (18:33 +1200)]
Merge pull request #20411 from eileenmcnaughton/ppp2

[REF] replace isFirst parameter

3 years agoMerge pull request #20410 from eileenmcnaughton/ppp
Eileen McNaughton [Tue, 25 May 2021 06:33:02 +0000 (18:33 +1200)]
Merge pull request #20410 from eileenmcnaughton/ppp

[REF] Remove now-unused params

3 years ago[REF] replace isFirst parameter
Eileen McNaughton [Tue, 25 May 2021 04:42:45 +0000 (16:42 +1200)]
[REF] replace isFirst parameter

Here we see that the 2 paths to 'recur' were calculating isFirst slightly differently.

In one case (the dominant one) we were looking to see if it was completed whereas
in the lesser path (paypal express) we were looking to see if it was not pending.

That leaves
'cancelled' & 'failed' in a limbo. I think logically we can't complete either of those
so the dominant definition is better

3 years ago[REF] Remove now-unused params
Eileen McNaughton [Tue, 25 May 2021 04:32:22 +0000 (16:32 +1200)]
[REF] Remove now-unused params

3 years agoMerge pull request #20407 from eileenmcnaughton/ppp
Seamus Lee [Tue, 25 May 2021 04:25:10 +0000 (14:25 +1000)]
Merge pull request #20407 from eileenmcnaughton/ppp

[REF] Paypal ipn - cleanup references to completion

3 years ago[REF] Paypal ipn - cleanup references to completion
Eileen McNaughton [Mon, 24 May 2021 22:59:56 +0000 (10:59 +1200)]
[REF] Paypal ipn - cleanup references to completion

This extracts a function to check if the contribution is completed.

I also rationalised the validation - it was using a combo of recur and first to
validate but on thinking it through I realised all it was saying was
'if we are finalising a pending contribution the amount must match'

I think that's fine even for recur with a change in amount - that seems
to me to be something that happens down the track but we still expect
the very first one to come in with the value it originally
had - if that is NOT true then we probably should just remove the check

3 years agoMerge pull request #20402 from eileenmcnaughton/pledge_tax
Eileen McNaughton [Tue, 25 May 2021 02:47:45 +0000 (14:47 +1200)]
Merge pull request #20402 from eileenmcnaughton/pledge_tax

[NFC] Cleanup in test class

3 years agoMerge pull request #20409 from eileenmcnaughton/dep
Eileen McNaughton [Tue, 25 May 2021 02:47:29 +0000 (14:47 +1200)]
Merge pull request #20409 from eileenmcnaughton/dep

[REF] Replace deprecated code call

3 years agoMerge pull request #20406 from mattwire/authnetmd5
Seamus Lee [Tue, 25 May 2021 00:34:44 +0000 (10:34 +1000)]
Merge pull request #20406 from mattwire/authnetmd5

Remove remains of md5 check from authorizenet

3 years agoMerge pull request #20405 from mattwire/eventcarttest
Seamus Lee [Tue, 25 May 2021 00:34:32 +0000 (10:34 +1000)]
Merge pull request #20405 from mattwire/eventcarttest

Update eventcart test to only test payment form

3 years ago[REF] Replace deprecated code call
Eileen McNaughton [Tue, 25 May 2021 00:05:45 +0000 (12:05 +1200)]
[REF] Replace deprecated code call

3 years ago[NFC] Cleanup in test class
Eileen McNaughton [Mon, 24 May 2021 20:49:21 +0000 (08:49 +1200)]
[NFC] Cleanup in test class

3 years agoMerge pull request #20404 from eileenmcnaughton/pledge_tax2
Seamus Lee [Mon, 24 May 2021 23:25:06 +0000 (09:25 +1000)]
Merge pull request #20404 from eileenmcnaughton/pledge_tax2

Fix contribution page pledge tests to create valid contributions

3 years agoRemove remains of md5 check from authorizenet
Matthew Wire [Wed, 19 May 2021 15:33:49 +0000 (16:33 +0100)]
Remove remains of md5 check from authorizenet

3 years agoMerge pull request #20360 from eileenmcnaughton/ppp
Seamus Lee [Mon, 24 May 2021 22:47:42 +0000 (08:47 +1000)]
Merge pull request #20360 from eileenmcnaughton/ppp

[REF] Cleanup validation in PaypalProIPN single function

3 years agoUpdate eventcart test to only test payment form
Matthew Wire [Tue, 18 May 2021 18:08:40 +0000 (19:08 +0100)]
Update eventcart test to only test payment form

3 years agoFix contribution page pledge tests to create valid contributions
Eileen McNaughton [Mon, 24 May 2021 21:43:42 +0000 (09:43 +1200)]
Fix contribution page pledge tests to create valid contributions

This addresses an issue where they were using a contribution page with a price
set but te submit params were not valid for that price set

3 years agoMerge pull request #20393 from eileenmcnaughton/ref_line
Seamus Lee [Mon, 24 May 2021 21:34:47 +0000 (07:34 +1000)]
Merge pull request #20393 from eileenmcnaughton/ref_line

[REF] Minor simplification

3 years agoMerge pull request #20390 from eileenmcnaughton/tax2
Eileen McNaughton [Mon, 24 May 2021 21:33:20 +0000 (09:33 +1200)]
Merge pull request #20390 from eileenmcnaughton/tax2

Tax fixes in unit test

3 years agoTax fixes in unit test
Eileen McNaughton [Mon, 24 May 2021 01:48:24 +0000 (13:48 +1200)]
Tax fixes in unit test

When this->isValidateFinancialsOnPostAssert is true the
test class checks that line items and payments are valid.

I'm trying to enable this for this class. However, there are some issues
that I have found fixes for (and at least 1 I'm still working on)
- some tests try to set tax_amount when it is not enabled
which is invalid - removed
- one test tries to use chaining in a way that
we know is not going to do a job of creating the entities
as it adds the payment before the line items. I switched
this to create a pending payment which doesn't alter the
thing under test & brings it closer to the
recommended flow
- one test is deliberately invalid - I marked it as
not eligible for the validation
- the price set id was not being passed to the Confirm->submit
function (accessed by tests, mostly via the ContributionPage.submit
api) - I added functionality to retrieve it

3 years agoMerge pull request #20400 from MegaphoneJon/check-signature
colemanw [Mon, 24 May 2021 20:02:08 +0000 (16:02 -0400)]
Merge pull request #20400 from MegaphoneJon/check-signature

fix arguments sent to hook_civicrm_check

3 years agospacing tidy
Nicol [Mon, 24 May 2021 18:27:55 +0000 (20:27 +0200)]
spacing tidy

3 years agoFixes expanding News dashlet css bug in Joomla 4
Nicol [Mon, 24 May 2021 18:25:26 +0000 (20:25 +0200)]
Fixes expanding News dashlet css bug in Joomla 4

3 years agoremoves subhead and extra padding in Joomla 4
Nicol [Mon, 24 May 2021 18:24:32 +0000 (20:24 +0200)]
removes subhead and extra padding in Joomla 4

3 years agotidying indents
Nicol [Mon, 24 May 2021 18:22:49 +0000 (20:22 +0200)]
tidying indents

3 years agoJoomla 4 fixes for menubar below menu & < $breakMin
Nicol [Mon, 24 May 2021 18:21:48 +0000 (20:21 +0200)]
Joomla 4 fixes for menubar below menu & < $breakMin

3 years agofix arguments sent to hook_civicrm_check
Jon Goldberg [Mon, 24 May 2021 18:14:59 +0000 (14:14 -0400)]
fix arguments sent to hook_civicrm_check

3 years agoMerge pull request #20383 from colemanw/afformUsageFixes
colemanw [Mon, 24 May 2021 13:39:44 +0000 (09:39 -0400)]
Merge pull request #20383 from colemanw/afformUsageFixes

Afform - Improve Gui, prefill & submit APIs

3 years agoAfform - Improve Gui, prefill & submit APIs
Coleman Watts [Sun, 23 May 2021 01:00:15 +0000 (21:00 -0400)]
Afform - Improve Gui, prefill & submit APIs

Standardizes prefill & submit APIs to use the same logic for validating contacts.
Displays correct form URL in GUI depending on is_frontend setting.
Shows warning about url arguments to prevent unintentional permissions escalation.

3 years ago[REF] Minor simplification
Eileen McNaughton [Mon, 24 May 2021 03:57:29 +0000 (15:57 +1200)]
[REF] Minor simplification

3 years agoMerge pull request #20391 from eileenmcnaughton/tax_valid
Monish Deb [Mon, 24 May 2021 06:44:01 +0000 (12:14 +0530)]
Merge pull request #20391 from eileenmcnaughton/tax_valid

Add call to validateAllContributions & fix getTotalAmount

3 years agoAdd call to validateAllContributions & fix getTotalAmount
Eileen McNaughton [Mon, 24 May 2021 02:29:04 +0000 (14:29 +1200)]
Add call to validateAllContributions & fix getTotalAmount

I've updated 2 tests for readability and extended one to call
validateAllContributions. The call failed and it turned out to
be the check was wrong. Fixing that caused a test to fail.
I have fixed the test by fixing getTotalAmount on the internal
helper BAO_Order class to include the tax_amount for each line
in the total.

I think this would most affect tests - but it might affect the
Membership_Form due to changes made recently to that
form so I'm on the fence about going for the rc with this
one

3 years agoMerge pull request #20358 from eileenmcnaughton/partial
Monish Deb [Mon, 24 May 2021 04:24:10 +0000 (09:54 +0530)]
Merge pull request #20358 from eileenmcnaughton/partial

Remove legacy references to partial_amount_to_pay

3 years agoMerge pull request #20389 from eileenmcnaughton/tax
Seamus Lee [Mon, 24 May 2021 03:27:52 +0000 (13:27 +1000)]
Merge pull request #20389 from eileenmcnaughton/tax

[NFC] {test} code cleanup in test class

3 years ago[NFC] {test} minor cleanup
Eileen McNaughton [Sun, 23 May 2021 23:54:39 +0000 (11:54 +1200)]
[NFC] {test} minor cleanup

3 years agoMerge pull request #20387 from eileenmcnaughton/tax
Eileen McNaughton [Mon, 24 May 2021 01:27:44 +0000 (13:27 +1200)]
Merge pull request #20387 from eileenmcnaughton/tax

[NFC] Minor cleanup

3 years agoMerge pull request #20386 from eileenmcnaughton/cont_f
Eileen McNaughton [Mon, 24 May 2021 00:37:14 +0000 (12:37 +1200)]
Merge pull request #20386 from eileenmcnaughton/cont_f

[NFC] Minor code cleanup

3 years agoMerge pull request #20370 from seamuslee001/phpunit8
Seamus Lee [Sun, 23 May 2021 23:46:14 +0000 (09:46 +1000)]
Merge pull request #20370 from seamuslee001/phpunit8

Use PHPUnit8 in main test suites

3 years ago[NFC] Minor cleanup
Eileen McNaughton [Sun, 23 May 2021 23:18:44 +0000 (11:18 +1200)]
[NFC] Minor cleanup

3 years ago[NFC] Minor code cleanup
Eileen McNaughton [Sun, 23 May 2021 23:08:06 +0000 (11:08 +1200)]
[NFC] Minor code cleanup

3 years agoMerge pull request #20384 from mattwire/deprecateddopayment
Eileen McNaughton [Sun, 23 May 2021 21:59:57 +0000 (09:59 +1200)]
Merge pull request #20384 from mattwire/deprecateddopayment

If paymentprocessor still uses doTransferCheckout/doDirectPayment trigger deprecated function warning

3 years agoIf paymentprocessor still uses doTransferCheckout/doDirectPayment trigger deprecated...
Matthew Wire [Sun, 23 May 2021 10:26:13 +0000 (11:26 +0100)]
If paymentprocessor still uses doTransferCheckout/doDirectPayment trigger deprecated function warning

3 years agoUse PHPUnit8 for main runs
Seamus Lee [Thu, 20 May 2021 23:50:52 +0000 (09:50 +1000)]
Use PHPUnit8 for main runs

3 years agoMerge pull request #20380 from seamuslee001/api_v3_civi_phpunit8_warnings
Eileen McNaughton [Sun, 23 May 2021 07:30:47 +0000 (19:30 +1200)]
Merge pull request #20380 from seamuslee001/api_v3_civi_phpunit8_warnings

[NFC] Fix PHPUnit8 Deprecation Warnings in api_v3 and Civi Test Suites

3 years ago[NFC] Fix PHPUnit8 Deprecation Warnings in api_v3 and Civi Test Suites
Seamus Lee [Sat, 22 May 2021 04:20:56 +0000 (14:20 +1000)]
[NFC] Fix PHPUnit8 Deprecation Warnings in api_v3 and Civi Test Suites

3 years agoMerge pull request #20373 from eileenmcnaughton/gc
Seamus Lee [Sat, 22 May 2021 21:33:29 +0000 (07:33 +1000)]
Merge pull request #20373 from eileenmcnaughton/gc

[REF] extract function to get locks

3 years agoMerge pull request #20374 from eileenmcnaughton/gc4
Seamus Lee [Sat, 22 May 2021 07:12:56 +0000 (17:12 +1000)]
Merge pull request #20374 from eileenmcnaughton/gc4

[NFC] [Test] Big cleanup in test class

3 years agoMerge pull request #20381 from seamuslee001/api_v4_phpunit8_warnings
Seamus Lee [Sat, 22 May 2021 06:35:11 +0000 (16:35 +1000)]
Merge pull request #20381 from seamuslee001/api_v4_phpunit8_warnings

[NFC] Fix PHPUnit8 Deprecation warnings in the api_v4 Test Suite

3 years agoMerge pull request #20379 from seamuslee001/e2e_phpunit8_warnings
Seamus Lee [Sat, 22 May 2021 05:56:15 +0000 (15:56 +1000)]
Merge pull request #20379 from seamuslee001/e2e_phpunit8_warnings

[NFC] Fix PHPUnit8 Warning notices in E2E And in some API unit tests

3 years ago[NFC] [Test] Big cleanup in test class
Eileen McNaughton [Fri, 21 May 2021 07:07:14 +0000 (19:07 +1200)]
[NFC] [Test] Big cleanup in test class

3 years agoMerge pull request #20378 from eileenmcnaughton/entry
Eileen McNaughton [Sat, 22 May 2021 05:28:28 +0000 (17:28 +1200)]
Merge pull request #20378 from eileenmcnaughton/entry

[REF] Remove unused variable

3 years ago[NFC] Fix PHPUnit8 Deprecation warnings in the api_v4 Test Suite
Seamus Lee [Sat, 22 May 2021 04:48:08 +0000 (14:48 +1000)]
[NFC] Fix PHPUnit8 Deprecation warnings in the api_v4 Test Suite

3 years agoFurther fixes
Seamus Lee [Sat, 22 May 2021 02:44:06 +0000 (12:44 +1000)]
Further fixes

3 years agoFix PHPUnit8 Warning notices in E2E And in some API unit tests
Seamus Lee [Sat, 22 May 2021 00:28:04 +0000 (10:28 +1000)]
Fix PHPUnit8 Warning notices in E2E And in some API unit tests

3 years agoMerge pull request #20377 from seamuslee001/crm_phpunit8_warnings
Seamus Lee [Sat, 22 May 2021 01:57:11 +0000 (11:57 +1000)]
Merge pull request #20377 from seamuslee001/crm_phpunit8_warnings

[NFC] Fix PHPUnit8 deprecation warnings in the CRM_AllTests suite

3 years ago[NFC] Fix PHPUnit8 deprecation warnings in the CRM_AllTests suite
Seamus Lee [Fri, 21 May 2021 22:33:18 +0000 (08:33 +1000)]
[NFC] Fix PHPUnit8 deprecation warnings in the CRM_AllTests suite

3 years ago[REF] Remove unused field parameters
Eileen McNaughton [Fri, 21 May 2021 23:03:11 +0000 (11:03 +1200)]
[REF] Remove unused field parameters

3 years ago[REF] extract function to get locks
Eileen McNaughton [Fri, 21 May 2021 05:52:38 +0000 (17:52 +1200)]
[REF] extract function to get locks

This is part of trying to make the logic more re-usable and make the
way of dealing with a single group more aligned with dealing with
multiple groups in this class

3 years agoMerge pull request #20305 from seamuslee001/afformEntityRefSubmit
colemanw [Fri, 21 May 2021 18:19:44 +0000 (14:19 -0400)]
Merge pull request #20305 from seamuslee001/afformEntityRefSubmit

Afform Entity Reference Submit

3 years agoAfform - Simplify postprocess event, cleanup api code & improve test coverage
Coleman Watts [Fri, 21 May 2021 00:10:37 +0000 (20:10 -0400)]
Afform - Simplify postprocess event, cleanup api code & improve test coverage

- Simplifies getEntityWeights function using topological sorting library
- Consolodates postprocess event listners to just processGenericEntity
- Adds missing getters/setters to api classes
- Improves the AfformSubmitEvent interface to make it easeier to use
- Adds to tests

3 years agoMerge pull request #20372 from eileenmcnaughton/tax
Seamus Lee [Fri, 21 May 2021 05:55:15 +0000 (15:55 +1000)]
Merge pull request #20372 from eileenmcnaughton/tax

[NFC] Further cleanup in test class

3 years ago[NFC] Further cleanup in test class
Eileen McNaughton [Fri, 21 May 2021 01:17:28 +0000 (13:17 +1200)]
[NFC] Further cleanup in test class

3 years agoMerge pull request #20369 from seamuslee001/more_voids
Seamus Lee [Fri, 21 May 2021 01:45:36 +0000 (11:45 +1000)]
Merge pull request #20369 from seamuslee001/more_voids

[NFC] Add in more voids to unit tests to support PHPUnit8

3 years agoMerge pull request #20371 from eileenmcnaughton/tax
Eileen McNaughton [Fri, 21 May 2021 01:19:20 +0000 (13:19 +1200)]
Merge pull request #20371 from eileenmcnaughton/tax

[NFC] [Test] Preliminary cleanup in test class

3 years agoMerge pull request #20353 from seamuslee001/fix_distmaker_sync_core_ext
Tim Otten [Fri, 21 May 2021 01:12:40 +0000 (18:12 -0700)]
Merge pull request #20353 from seamuslee001/fix_distmaker_sync_core_ext

Fix Distmaker building by ensuring we are rsyncing from the right folder

3 years agoMerge pull request #20217 from eileenmcnaughton/contop
Seamus Lee [Fri, 21 May 2021 01:06:27 +0000 (11:06 +1000)]
Merge pull request #20217 from eileenmcnaughton/contop

[Test] Add test cover for contribution tokens in pdf letter

3 years agoMerge pull request #20368 from eileenmcnaughton/cc
Seamus Lee [Fri, 21 May 2021 00:13:50 +0000 (10:13 +1000)]
Merge pull request #20368 from eileenmcnaughton/cc

[REF] Slightly more logical order of code

3 years ago[NFC] [Test] Preliminary cleanup in test class
Eileen McNaughton [Thu, 20 May 2021 23:41:47 +0000 (11:41 +1200)]
[NFC] [Test] Preliminary cleanup in test class

3 years ago[NFC] Add in more voids to unit tests to support PHPUnit8
Seamus Lee [Thu, 20 May 2021 23:49:10 +0000 (09:49 +1000)]
[NFC] Add in more voids to unit tests to support PHPUnit8

3 years agoMerge pull request #20367 from colemanw/deprecateBulkSave
Seamus Lee [Thu, 20 May 2021 23:45:05 +0000 (09:45 +1000)]
Merge pull request #20367 from colemanw/deprecateBulkSave

Deprecate function CRM_Core_BAO_CustomField::bulkSave

3 years ago[REF] Slightly more logical order of code
Eileen McNaughton [Thu, 20 May 2021 22:34:09 +0000 (10:34 +1200)]
[REF] Slightly more logical order of code

Just moves the lock check to the same area

3 years agoDeprecate function CRM_Core_BAO_CustomField::bulkSave
Coleman Watts [Thu, 20 May 2021 21:48:08 +0000 (17:48 -0400)]
Deprecate function CRM_Core_BAO_CustomField::bulkSave

3 years agoMerge pull request #20366 from demeritcowboy/more-oo
Seamus Lee [Thu, 20 May 2021 21:24:19 +0000 (07:24 +1000)]
Merge pull request #20366 from demeritcowboy/more-oo

[REF] Useradd contact task - Use OO instead of hardcoding "if Wordpress"

3 years agoMerge pull request #20359 from eileenmcnaughton/in
Seamus Lee [Thu, 20 May 2021 21:23:27 +0000 (07:23 +1000)]
Merge pull request #20359 from eileenmcnaughton/in

Superficial tidy up in test class

3 years agoMerge pull request #20363 from eileenmcnaughton/group
Seamus Lee [Thu, 20 May 2021 21:22:52 +0000 (07:22 +1000)]
Merge pull request #20363 from eileenmcnaughton/group

Cleanup - declare return types, remove unused var

3 years agoMerge pull request #20196 from eileenmcnaughton/import
Seamus Lee [Thu, 20 May 2021 21:20:46 +0000 (07:20 +1000)]
Merge pull request #20196 from eileenmcnaughton/import

[REF] Cleanup on import rows error

3 years agoMerge pull request #20362 from eileenmcnaughton/save
colemanw [Thu, 20 May 2021 21:19:21 +0000 (17:19 -0400)]
Merge pull request #20362 from eileenmcnaughton/save

Update bulkSave test to use the api

3 years agoMerge pull request #20349 from colemanw/searchKitFixMenuPerm
Eileen McNaughton [Thu, 20 May 2021 21:17:32 +0000 (09:17 +1200)]
Merge pull request #20349 from colemanw/searchKitFixMenuPerm

SearchKit - Fix menu permission