civicrm-core.git
4 years agoMerge pull request #17588 from artfulrobot/artfulrobot-property-bag-support-empty
Eileen McNaughton [Sat, 20 Jun 2020 22:54:40 +0000 (10:54 +1200)]
Merge pull request #17588 from artfulrobot/artfulrobot-property-bag-support-empty

Improve PropertyBag handling of offsetGet and custom properties; add …

4 years agoMerge pull request #17644 from eileenmcnaughton/export_fix_standalonne
Eileen McNaughton [Sat, 20 Jun 2020 22:02:54 +0000 (10:02 +1200)]
Merge pull request #17644 from eileenmcnaughton/export_fix_standalonne

Export fix

4 years agoMerge pull request #17672 from mattwire/onbehalfof
Eileen McNaughton [Sat, 20 Jun 2020 21:31:46 +0000 (09:31 +1200)]
Merge pull request #17672 from mattwire/onbehalfof

Fix validation of select2 fields in "On behalf of Organisation" block

4 years agoExport - further cleanup export class to remove unnecessary switch
Coleman Watts [Thu, 18 Jun 2020 20:08:47 +0000 (16:08 -0400)]
Export - further cleanup export class to remove unnecessary switch

4 years agoFix issues with select2 validation when it is part of hidden 'On behalf of organisati...
Matthew Wire [Sat, 20 Jun 2020 11:04:36 +0000 (12:04 +0100)]
Fix issues with select2 validation when it is part of hidden 'On behalf of organisation' block

4 years agoWhitespace cleanup
Matthew Wire [Sat, 20 Jun 2020 10:46:41 +0000 (11:46 +0100)]
Whitespace cleanup

4 years agoMerge pull request #17671 from seamuslee001/select2_error_message
Seamus Lee [Sat, 20 Jun 2020 14:28:15 +0000 (00:28 +1000)]
Merge pull request #17671 from seamuslee001/select2_error_message

[REF] Fix jquery error message display on select2 field validation

4 years agoMerge pull request #17670 from seamuslee001/fix_allow_clear_radio
Matthew Wire [Sat, 20 Jun 2020 11:32:47 +0000 (12:32 +0100)]
Merge pull request #17670 from seamuslee001/fix_allow_clear_radio

[REF] Fix allowing users to clear values for raido custom fields when…

4 years agoMerge pull request #17665 from eileenmcnaughton/ct
Seamus Lee [Sat, 20 Jun 2020 11:02:31 +0000 (21:02 +1000)]
Merge pull request #17665 from eileenmcnaughton/ct

Fix master regression on inactive contact types

4 years ago[REF] Fix jquery error message display on select2 field validation
Seamus Lee [Sat, 20 Jun 2020 10:57:04 +0000 (20:57 +1000)]
[REF] Fix jquery error message display on select2 field validation

4 years ago[REF] Fix allowing users to clear values for raido custom fields when not required
Seamus Lee [Sat, 20 Jun 2020 10:11:47 +0000 (20:11 +1000)]
[REF] Fix allowing users to clear values for raido custom fields when not required

4 years agoMerge pull request #16488 from mattwire/quickform_requiredfields
Seamus Lee [Sat, 20 Jun 2020 09:52:56 +0000 (19:52 +1000)]
Merge pull request #16488 from mattwire/quickform_requiredfields

Pass required attribute for quickform fields through to form

4 years agoFix master regression on inactive contact types
eileen [Sat, 20 Jun 2020 00:45:16 +0000 (12:45 +1200)]
Fix master regression on inactive contact types

Removing the WHERE type.name = NULL here makes sense

https://github.com/civicrm/civicrm-core/commit/351e8d470a95e1a610280731706c816033fb79fa#diff-ae3cfb8afd3fe1ab8f471b3a069563cdL244

but a few lines later an extra condition is added - we need the WHERE there to prevent it being
added to the join clause.

Note that I did something a bit yuck with the static. I want to properly re-write the function
with consistent caching but after it's under testing, hence a quick fix

4 years agoMerge pull request #17615 from seamuslee001/phpunit7_new
Seamus Lee [Sat, 20 Jun 2020 03:54:46 +0000 (13:54 +1000)]
Merge pull request #17615 from seamuslee001/phpunit7_new

Use PHPUnit7 as the primary test runner for PHP versions >= 7.1 when using the phpunit script

4 years agoMerge pull request #17642 from eileenmcnaughton/trxn
Seamus Lee [Sat, 20 Jun 2020 01:54:44 +0000 (11:54 +1000)]
Merge pull request #17642 from eileenmcnaughton/trxn

[REF] Extract getTestTrxnID

4 years agoMerge pull request #17654 from eileenmcnaughton/cancel
Seamus Lee [Sat, 20 Jun 2020 01:53:39 +0000 (11:53 +1000)]
Merge pull request #17654 from eileenmcnaughton/cancel

Fix A.net to retrieve processor id from property bag

4 years ago[REF] Use PHPUnit7
Seamus Lee [Mon, 15 Jun 2020 00:31:52 +0000 (10:31 +1000)]
[REF] Use PHPUnit7

Fix tap printer

4 years agoMerge pull request #17663 from seamuslee001/prep_phpunit7
Eileen McNaughton [Sat, 20 Jun 2020 01:29:54 +0000 (13:29 +1200)]
Merge pull request #17663 from seamuslee001/prep_phpunit7

[NFC] Fix tests in prepartion for phpunit7

4 years ago[NFC] Fix tests in prepartion for phpunit7
Seamus Lee [Fri, 19 Jun 2020 06:16:53 +0000 (16:16 +1000)]
[NFC] Fix tests in prepartion for phpunit7

4 years agoMerge pull request #17660 from seamuslee001/fixflexmailer
Seamus Lee [Fri, 19 Jun 2020 10:03:16 +0000 (20:03 +1000)]
Merge pull request #17660 from seamuslee001/fixflexmailer

[REF] Fix Compatability issue with flexmailer caused by the PHP7.4 fix

4 years agoMerge pull request #17662 from seamuslee001/master
Seamus Lee [Fri, 19 Jun 2020 10:00:04 +0000 (20:00 +1000)]
Merge pull request #17662 from seamuslee001/master

Revert "[NFC] Fix tests in prepartion for phpunit7"

4 years agoRevert "[NFC] Fix tests in prepartion for phpunit7"
Seamus Lee [Fri, 19 Jun 2020 09:59:03 +0000 (19:59 +1000)]
Revert "[NFC] Fix tests in prepartion for phpunit7"

This reverts commit 11a56cfe5f918a54284b7614a9489d53c9c41208.

4 years agoMerge pull request #17661 from seamuslee001/prep_phpunit7
Seamus Lee [Fri, 19 Jun 2020 09:58:14 +0000 (19:58 +1000)]
Merge pull request #17661 from seamuslee001/prep_phpunit7

[NFC] Fix tests in preparation for phpunit7

4 years ago[NFC] Fix tests in prepartion for phpunit7
Seamus Lee [Fri, 19 Jun 2020 06:16:53 +0000 (16:16 +1000)]
[NFC] Fix tests in prepartion for phpunit7

4 years ago[REF] Fix Compatability issue with flexmailer caused by the PHP7.4 fix
Seamus Lee [Fri, 19 Jun 2020 07:41:59 +0000 (17:41 +1000)]
[REF] Fix Compatability issue with flexmailer caused by the PHP7.4 fix

4 years agoMerge pull request #17608 from seamuslee001/dev_translation_48
Seamus Lee [Fri, 19 Jun 2020 04:09:45 +0000 (14:09 +1000)]
Merge pull request #17608 from seamuslee001/dev_translation_48

dev/translation#48 Implement Brick/Money to better handle money values

4 years agoMerge pull request #17612 from eileenmcnaughton/format
Seamus Lee [Fri, 19 Jun 2020 02:05:59 +0000 (12:05 +1000)]
Merge pull request #17612 from eileenmcnaughton/format

[NFC] Remove instances where html is passed to crmMoney

4 years agodev/translation#48 Implement Brick/Money to better handle currecny values
Seamus Lee [Sun, 14 Jun 2020 04:24:36 +0000 (14:24 +1000)]
dev/translation#48 Implement Brick/Money to better handle currecny values

Added in test case as per Eileen comment so we know we can handle large floats

4 years agoFix A.net to retrieve processor id from property bag
eileen [Thu, 18 Jun 2020 21:23:19 +0000 (09:23 +1200)]
Fix A.net to retrieve processor id from property bag

4 years agoMerge pull request #17611 from eileenmcnaughton/renew
Seamus Lee [Fri, 19 Jun 2020 00:52:44 +0000 (10:52 +1000)]
Merge pull request #17611 from eileenmcnaughton/renew

[REF] Consolidate code in processMembership

4 years agoMerge pull request #17656 from civicrm/5.27
Seamus Lee [Thu, 18 Jun 2020 23:40:26 +0000 (09:40 +1000)]
Merge pull request #17656 from civicrm/5.27

5.27

4 years agoMerge pull request #17008 from ivan-compucorp/CPS-70-fix-radio-value
Seamus Lee [Thu, 18 Jun 2020 23:39:58 +0000 (09:39 +1000)]
Merge pull request #17008 from ivan-compucorp/CPS-70-fix-radio-value

dev/core#1566 Fix display value for money radio custom field

4 years agoMerge pull request #17652 from twocs/patch-1
Seamus Lee [Thu, 18 Jun 2020 23:31:06 +0000 (09:31 +1000)]
Merge pull request #17652 from twocs/patch-1

Misspelled word

4 years agoMerge pull request #17651 from colemanw/domainSer
Seamus Lee [Thu, 18 Jun 2020 23:30:52 +0000 (09:30 +1000)]
Merge pull request #17651 from colemanw/domainSer

Add serialize metadata to domain.locales field

4 years agoMerge pull request #17653 from MegaphoneJon/dynamicreference-fix-527
Seamus Lee [Thu, 18 Jun 2020 22:25:42 +0000 (08:25 +1000)]
Merge pull request #17653 from MegaphoneJon/dynamicreference-fix-527

handle less common dynamic reference cases

4 years agoMerge pull request #17648 from seamuslee001/manual_processor_set_paymentProceesor
Eileen McNaughton [Thu, 18 Jun 2020 22:11:58 +0000 (10:11 +1200)]
Merge pull request #17648 from seamuslee001/manual_processor_set_paymentProceesor

[REF] Ensure that the Manual Payment Processor sets the _paymentProc…

4 years agoMerge pull request #17649 from seamuslee001/fix_array_acess_non_array
Eileen McNaughton [Thu, 18 Jun 2020 21:37:55 +0000 (09:37 +1200)]
Merge pull request #17649 from seamuslee001/fix_array_acess_non_array

[REF] Fix PHP7.4 Test fails when we are accessing array keys when the…

4 years agohandle less common dynamic reference cases
Jon Goldberg [Tue, 16 Jun 2020 17:43:49 +0000 (13:43 -0400)]
handle less common dynamic reference cases

4 years agoMisspelled word
Tom Anderson [Thu, 18 Jun 2020 18:13:43 +0000 (03:43 +0930)]
Misspelled word

receieve -> receive

4 years agoAdd serialize metadata to domain.locales field
Coleman Watts [Thu, 18 Jun 2020 16:36:29 +0000 (12:36 -0400)]
Add serialize metadata to domain.locales field

4 years agoCPS-70: Add unit test for Money/Radio field values
Ivan Klochko [Thu, 18 Jun 2020 05:33:09 +0000 (08:33 +0300)]
CPS-70: Add unit test for Money/Radio field values

4 years agoPropertyBag now uses deprecatedFunctionWarning instead of log; is silent during cast...
Rich Lott / Artful Robot [Thu, 18 Jun 2020 14:30:55 +0000 (15:30 +0100)]
PropertyBag now uses deprecatedFunctionWarning instead of log; is silent during cast() calls

4 years agoMerge pull request #17647 from seamuslee001/php74_query_fix_2
Seamus Lee [Thu, 18 Jun 2020 10:45:28 +0000 (20:45 +1000)]
Merge pull request #17647 from seamuslee001/php74_query_fix_2

[REF] Fix parts of code where curly brackets were being used for array or string access which is deprecated in PHP7.4

4 years ago[REF] Fix PHP7.4 Test fails when we are accessing array keys when the value is not...
Seamus Lee [Thu, 18 Jun 2020 08:59:47 +0000 (18:59 +1000)]
[REF] Fix PHP7.4 Test fails when we are accessing array keys when the value is not an array

4 years ago[REF] Ensure that the Manaual Payment Processor sets the _paymentProcessor variable...
Seamus Lee [Thu, 18 Jun 2020 08:53:20 +0000 (18:53 +1000)]
[REF] Ensure that the Manaual Payment Processor sets the _paymentProcessor variable like other Processors to fix issues in PHP7.4 and UnitTests

4 years ago[REF] Patch electrolinux/phpquery and also core files to fix using {} when doing...
Seamus Lee [Thu, 18 Jun 2020 08:24:53 +0000 (18:24 +1000)]
[REF] Patch electrolinux/phpquery and also core files to fix using {} when doing array or string access when it should be []

4 years agoMerge pull request #17646 from colemanw/isMultilingual
Seamus Lee [Thu, 18 Jun 2020 05:52:10 +0000 (15:52 +1000)]
Merge pull request #17646 from colemanw/isMultilingual

Fix isMultilingual to use static caching and respect current domain

4 years agoFix isMultilingual to use static caching and respect current domain
Coleman Watts [Thu, 18 Jun 2020 00:35:13 +0000 (20:35 -0400)]
Fix isMultilingual to use static caching and respect current domain

4 years agoMerge pull request #17637 from mlutfy/isFormInViewOrEditMode
Mathieu Lu [Wed, 17 Jun 2020 17:25:47 +0000 (13:25 -0400)]
Merge pull request #17637 from mlutfy/isFormInViewOrEditMode

Add CRM_Core_Form::isFormInViewMode and CRM_Core_Form::isFormInEditMode

4 years agoAdds CRM_Core_Form::isFormInViewMode and CRM_Core_Form::isFormInEditMode (useful...
Mathieu Lutfy [Tue, 16 Jun 2020 19:42:58 +0000 (15:42 -0400)]
Adds CRM_Core_Form::isFormInViewMode and CRM_Core_Form::isFormInEditMode (useful for extensions implementing buildForm)

4 years agoWIP - fix for export
eileen [Wed, 17 Jun 2020 09:08:14 +0000 (21:08 +1200)]
WIP - fix for export

4 years ago[REF] Extract getTestTrxnID
eileen [Wed, 17 Jun 2020 01:46:39 +0000 (13:46 +1200)]
[REF] Extract getTestTrxnID

4 years agoMerge pull request #17640 from samuelsov/bugreportcivigrant
Seamus Lee [Wed, 17 Jun 2020 01:09:11 +0000 (11:09 +1000)]
Merge pull request #17640 from samuelsov/bugreportcivigrant

Bug in Grant statistics report

4 years agoMerge pull request #17639 from mlutfy/pfSetEntity
Eileen McNaughton [Tue, 16 Jun 2020 23:22:15 +0000 (11:22 +1200)]
Merge pull request #17639 from mlutfy/pfSetEntity

Price Field Form: save the fid for the postProcess hook

4 years agoPrice Field Form: save the fid for the postProcess hook
Mathieu Lutfy [Tue, 16 Jun 2020 19:57:40 +0000 (15:57 -0400)]
Price Field Form: save the fid for the postProcess hook

4 years agoBug in Grant statistics report
Samuel Vanhove [Tue, 16 Jun 2020 20:03:47 +0000 (16:03 -0400)]
Bug in Grant statistics report

4 years agoMerge pull request #17516 from eileenmcnaughton/pf_field
Mathieu Lu [Tue, 16 Jun 2020 19:55:06 +0000 (15:55 -0400)]
Merge pull request #17516 from eileenmcnaughton/pf_field

Add EntityFormTrait to pricefieldForm - stdised getEntityId()

4 years agoSet CRM_Core_Form::isFormInViewOrEditMode as public (useful for extensions implementi...
Mathieu Lutfy [Tue, 16 Jun 2020 13:07:32 +0000 (09:07 -0400)]
Set CRM_Core_Form::isFormInViewOrEditMode as public (useful for extensions implementing buildForm)

4 years agoMerge pull request #17634 from civicrm/5.27
Seamus Lee [Tue, 16 Jun 2020 10:04:27 +0000 (20:04 +1000)]
Merge pull request #17634 from civicrm/5.27

5.27

4 years agoMerge pull request #17635 from seamuslee001/5262_notes
Seamus Lee [Tue, 16 Jun 2020 10:00:57 +0000 (20:00 +1000)]
Merge pull request #17635 from seamuslee001/5262_notes

5.26.2 Release Notes

4 years agoUpdate 5.26.2.md
Tim Otten [Tue, 16 Jun 2020 08:25:08 +0000 (01:25 -0700)]
Update 5.26.2.md

4 years agoUpdate 5.26.2.md
Tim Otten [Tue, 16 Jun 2020 05:49:04 +0000 (22:49 -0700)]
Update 5.26.2.md

4 years ago5.26.2 Release Notes
Seamus Lee [Tue, 16 Jun 2020 00:27:55 +0000 (10:27 +1000)]
5.26.2 Release Notes

4 years agoMerge pull request #17632 from seamuslee001/dev_core_1806
Seamus Lee [Tue, 16 Jun 2020 08:13:00 +0000 (18:13 +1000)]
Merge pull request #17632 from seamuslee001/dev_core_1806

dev/core#1806 - Fix import of "Radio"-style custom fields using option "label"

4 years agodev/core#1806 Fix issue with importing radio custom data field using the option label
Seamus Lee [Tue, 16 Jun 2020 04:57:41 +0000 (14:57 +1000)]
dev/core#1806 Fix issue with importing radio custom data field using the option label

4 years agoMerge pull request #17631 from seamuslee001/master
Seamus Lee [Tue, 16 Jun 2020 04:21:01 +0000 (14:21 +1000)]
Merge pull request #17631 from seamuslee001/master

5.27

4 years agoRegenerate DAO
Seamus Lee [Tue, 16 Jun 2020 04:20:04 +0000 (14:20 +1000)]
Regenerate DAO

4 years agoMerge in 5.27
Seamus Lee [Tue, 16 Jun 2020 04:19:37 +0000 (14:19 +1000)]
Merge in 5.27

4 years agoMerge pull request #17628 from colemanw/customOptionsFallback
Tim Otten [Tue, 16 Jun 2020 04:14:39 +0000 (21:14 -0700)]
Merge pull request #17628 from colemanw/customOptionsFallback

dev/core#1816 - Legacy support for matching custom field options by label

4 years agoMerge pull request #17627 from demeritcowboy/deprecate-allactivitytypes
Seamus Lee [Tue, 16 Jun 2020 02:36:31 +0000 (12:36 +1000)]
Merge pull request #17627 from demeritcowboy/deprecate-allactivitytypes

dev/core#1433 - Add deprecation warning for CRM_Case_XMLProcessor::allActivityTypes

4 years agodev/core#1816 - Legacy support for matching custom field options by label
Coleman Watts [Tue, 16 Jun 2020 00:15:02 +0000 (20:15 -0400)]
dev/core#1816 - Legacy support for matching custom field options by label

4 years agoMerge pull request #17625 from demeritcowboy/missing-activitytype-5.27
Seamus Lee [Tue, 16 Jun 2020 00:58:31 +0000 (10:58 +1000)]
Merge pull request #17625 from demeritcowboy/missing-activitytype-5.27

dev/core#1822 - Fix missing newly created activity types from the dropdown on the new activity form

4 years agoadd deprecation warning
demeritcowboy [Tue, 16 Jun 2020 00:13:53 +0000 (20:13 -0400)]
add deprecation warning

4 years agoMerge pull request #17622 from seamuslee001/smart_group_error
Seamus Lee [Tue, 16 Jun 2020 00:07:14 +0000 (10:07 +1000)]
Merge pull request #17622 from seamuslee001/smart_group_error

Fix issue with building smart groups when  is empty

4 years agofix missing newly created activity types
demeritcowboy [Mon, 15 Jun 2020 23:32:47 +0000 (19:32 -0400)]
fix missing newly created activity types

4 years agoMerge pull request #17619 from seamuslee001/dev_core_1823_alt
Seamus Lee [Mon, 15 Jun 2020 23:33:02 +0000 (09:33 +1000)]
Merge pull request #17619 from seamuslee001/dev_core_1823_alt

dev/core#1823 Fix building the Price Field visibility options

4 years agoMerge pull request #17616 from demeritcowboy/xml-acttype-more-more
Eileen McNaughton [Mon, 15 Jun 2020 23:03:33 +0000 (11:03 +1200)]
Merge pull request #17616 from demeritcowboy/xml-acttype-more-more

dev/core#1433 - Replace last instances of calls to CRM_Case_XMLProcessor::allActivityTypes()

4 years agoFix issue with building smart groups when is empty
Seamus Lee [Mon, 15 Jun 2020 23:01:59 +0000 (09:01 +1000)]
Fix issue with building smart groups when  is empty

4 years agodev/core#1823 Fix building the Price Field visibility options
Seamus Lee [Mon, 15 Jun 2020 22:00:54 +0000 (08:00 +1000)]
dev/core#1823 Fix building the Price Field visibility options

4 years ago[REF] Consolidate code in processMembership
eileen [Tue, 2 Jun 2020 08:53:40 +0000 (20:53 +1200)]
[REF] Consolidate code in processMembership

Now we have test cover from https://github.com/civicrm/civicrm-core/pull/17605 and other
recents we can consolidate this code & be comfortable the test cover will pick up issues.

4 years agotest for case search form
demeritcowboy [Mon, 15 Jun 2020 14:33:02 +0000 (10:33 -0400)]
test for case search form

4 years agoreplace function that doesn't cache properly with the one it ends up calling which...
demeritcowboy [Mon, 15 Jun 2020 14:32:39 +0000 (10:32 -0400)]
replace function that doesn't cache properly with the one it ends up calling which does cache properly

4 years agoMerge pull request #17610 from eileenmcnaughton/tax
Seamus Lee [Mon, 15 Jun 2020 12:22:46 +0000 (22:22 +1000)]
Merge pull request #17610 from eileenmcnaughton/tax

dev/core#1603 remove places where taxAmount is rounded

4 years agoPropertyBag call deprecatedFunctionWarning on array access to custom props
Rich Lott / Artful Robot [Mon, 15 Jun 2020 06:17:34 +0000 (07:17 +0100)]
PropertyBag call deprecatedFunctionWarning on array access to custom props

4 years agoMerge pull request #17614 from demeritcowboy/xmlproc-acttypes-more
Seamus Lee [Mon, 15 Jun 2020 00:34:50 +0000 (10:34 +1000)]
Merge pull request #17614 from demeritcowboy/xmlproc-acttypes-more

dev/core#1433 - Replace call to CRM_Case_XMLProcessor::allActivityTypes() that doesn't cache properly

4 years agoPayment PropertyBag now issues warning if array access used to get custom prop
Rich Lott / Artful Robot [Sun, 14 Jun 2020 22:05:54 +0000 (23:05 +0100)]
Payment PropertyBag now issues warning if array access used to get custom prop

4 years agoreplace call to function that doesn't cache properly
demeritcowboy [Sun, 14 Jun 2020 21:45:10 +0000 (17:45 -0400)]
replace call to function that doesn't cache properly

4 years agoMerge pull request #17613 from civicrm/5.27
Eileen McNaughton [Sun, 14 Jun 2020 20:34:32 +0000 (08:34 +1200)]
Merge pull request #17613 from civicrm/5.27

5.27 to master

4 years agoMerge pull request #17607 from eileenmcnaughton/pi
Matthew Wire [Sun, 14 Jun 2020 20:32:57 +0000 (21:32 +0100)]
Merge pull request #17607 from eileenmcnaughton/pi

Fix payment instrument bug by using correct payment instrument

4 years agodev/core#1603 remove places where taxAmount is rounded
eileen [Sun, 14 Jun 2020 05:33:52 +0000 (17:33 +1200)]
dev/core#1603 remove places where taxAmount is rounded

4 years ago[NFC] Remove instances where html is passed to crmMoney
eileen [Sun, 14 Jun 2020 06:18:36 +0000 (18:18 +1200)]
[NFC] Remove instances where html is passed to crmMoney

After grepping I'm pretty confident the other params are never passed so removed

4 years agoMerge pull request #17600 from seamuslee001/null_array_access
Seamus Lee [Sun, 14 Jun 2020 05:06:16 +0000 (15:06 +1000)]
Merge pull request #17600 from seamuslee001/null_array_access

[REF] Fix issue with using array access tools on NULL values

4 years ago[REF] Fix issue with using array access tools on NULL values
Seamus Lee [Sat, 13 Jun 2020 07:20:59 +0000 (17:20 +1000)]
[REF] Fix issue with using array access tools on NULL values

4 years agoMerge pull request #17604 from seamuslee001/incorrect_array_key_exist_group
Seamus Lee [Sun, 14 Jun 2020 03:58:53 +0000 (13:58 +1000)]
Merge pull request #17604 from seamuslee001/incorrect_array_key_exist_group

[REF] Replace incorrect usage of array_key_exists with property_exist…

4 years agoMerge pull request #17605 from eileenmcnaughton/membertest
Seamus Lee [Sun, 14 Jun 2020 03:58:38 +0000 (13:58 +1000)]
Merge pull request #17605 from eileenmcnaughton/membertest

[NFC] Add assertions to existing test to lock in current behaviour

4 years agoMerge pull request #17606 from seamuslee001/php74_mock
Seamus Lee [Sun, 14 Jun 2020 03:53:38 +0000 (13:53 +1000)]
Merge pull request #17606 from seamuslee001/php74_mock

[NFC] Update mocking to use getMockBuilder instead instead of createMock

4 years agoFix payment instrument bug by using correct payment instrument
eileen [Sun, 14 Jun 2020 02:36:46 +0000 (14:36 +1200)]
Fix payment instrument bug by using correct payment instrument

Per https://github.com/civicrm/civicrm-core/pull/17589 it is necessary that we do NOT pass the wrong payment_instrument_id
to the payment processor. BUT we have to provide accurate defaults for manual payments. This is a narrower fix than

- back office membership form
- back office participant form
- back office contribution form

and in all cases the Manual processor still loaded correctly. I don't feel I can say this is the last fix in this
area but it stands alone as a sensible fix to do and also one that should address the immediate issue.

Note there is some weirdness in a second function in EventFees - that function should GO IMHO - but I have not yet reached it in
UI testing to confirm if other changes need to be made.

4 years ago[NFC] Update mocking to use getMockBuilder instead instead of createMock
Seamus Lee [Sun, 14 Jun 2020 02:22:23 +0000 (12:22 +1000)]
[NFC] Update mocking to use getMockBuilder instead instead of createMock

4 years ago[NFC] Add assertions to existing test to lock in current behaviour
eileen [Sun, 14 Jun 2020 01:57:07 +0000 (13:57 +1200)]
[NFC] Add assertions to existing test to lock in current behaviour

Per standard tdd refactoring I'm adding tests before I alter the code that is tested. Note that the code
has quite a bit I think can go

4 years ago[REF] Replace incorrect usage of array_key_exists with property_exists in Group BAO...
Seamus Lee [Sun, 14 Jun 2020 01:43:25 +0000 (11:43 +1000)]
[REF] Replace incorrect usage of array_key_exists with property_exists in Group BAO Class