civicrm-core.git
3 years agoUpdate CRM_Utils_Constant::value to support env variables
eileen [Tue, 20 Oct 2020 02:27:00 +0000 (15:27 +1300)]
Update CRM_Utils_Constant::value to support env variables

This is something I discussed with @totten earlier but as the rc was being cut at the time
we went for the more conservative approach of only adding env support to thhe debug_query
function.  This extends to all defines - meaning they can be defined at the script level e.

env CIVICRM_DEBUG_LOG_QUERY=backtrace drush cvapi

(that already works)

3 years agoMerge pull request #18801 from eileenmcnaughton/canceltest
Seamus Lee [Tue, 20 Oct 2020 00:35:36 +0000 (11:35 +1100)]
Merge pull request #18801 from eileenmcnaughton/canceltest

Remove always true if

3 years agoRemove always true if
eileen [Mon, 19 Oct 2020 19:24:56 +0000 (08:24 +1300)]
Remove always true if

Since paymentProcessorObj is loaded as the manual processor where another does not exist
the processor condition is always true - so this if is obsolete

3 years agoMerge pull request #18790 from eileenmcnaughton/canceltest
Eileen McNaughton [Mon, 19 Oct 2020 19:21:45 +0000 (08:21 +1300)]
Merge pull request #18790 from eileenmcnaughton/canceltest

Add test for recurring links and clean up method of retrieving recurring

3 years agoMerge pull request #18798 from eileenmcnaughton/memtest
Eileen McNaughton [Mon, 19 Oct 2020 19:21:15 +0000 (08:21 +1300)]
Merge pull request #18798 from eileenmcnaughton/memtest

Replace BAO calls with api calls in test class

3 years agoMerge pull request #18797 from eileenmcnaughton/apim
Eileen McNaughton [Mon, 19 Oct 2020 19:20:55 +0000 (08:20 +1300)]
Merge pull request #18797 from eileenmcnaughton/apim

Switch to calling api

3 years agoMerge pull request #18796 from eileenmcnaughton/api3
colemanw [Mon, 19 Oct 2020 11:55:58 +0000 (07:55 -0400)]
Merge pull request #18796 from eileenmcnaughton/api3

Switch to calling the api

3 years agoMerge pull request #18785 from eileenmcnaughton/status
Matthew Wire [Mon, 19 Oct 2020 09:40:22 +0000 (10:40 +0100)]
Merge pull request #18785 from eileenmcnaughton/status

unit test for #18306 - order create api test for contribution

3 years agoMerge pull request #18789 from jitendrapurohit/emailcc
Matthew Wire [Mon, 19 Oct 2020 09:36:54 +0000 (10:36 +0100)]
Merge pull request #18789 from jitendrapurohit/emailcc

Fix sendconfirmation api to override receipt params

3 years agoReplace BAO calls with api calls in test class
eileen [Mon, 19 Oct 2020 08:10:24 +0000 (21:10 +1300)]
Replace BAO calls with api calls in test class

3 years agoMerge pull request #18795 from eileenmcnaughton/api
Seamus Lee [Mon, 19 Oct 2020 07:21:17 +0000 (18:21 +1100)]
Merge pull request #18795 from eileenmcnaughton/api

[Test] - Fix some tests to call API not BAO

3 years agoSwitch to calling api
eileen [Mon, 19 Oct 2020 07:18:12 +0000 (20:18 +1300)]
Switch to calling api

Test cover in
CRM_Member_BAO_MembershipTest::testMembershipUpdateDoesNotDeleteRelatedMembershipsByMistake

3 years agoMerge pull request #18791 from eileenmcnaughton/statusm
Eileen McNaughton [Mon, 19 Oct 2020 07:04:24 +0000 (20:04 +1300)]
Merge pull request #18791 from eileenmcnaughton/statusm

Remove instances of variable variables

3 years agoSwitch to calling the api
eileen [Mon, 19 Oct 2020 06:48:45 +0000 (19:48 +1300)]
Switch to calling the api

Test cover in
api_v3_ContactTest.testMergeOrganizations

3 years agoMerge pull request #18739 from eileenmcnaughton/ef
Eileen McNaughton [Mon, 19 Oct 2020 06:08:35 +0000 (19:08 +1300)]
Merge pull request #18739 from eileenmcnaughton/ef

[Ref] Minor code extraction

3 years agoAdd test for recurring links and clean up method of retrieving recurring
eileen [Sun, 18 Oct 2020 23:14:53 +0000 (12:14 +1300)]
Add test for recurring links and clean up method of retrieving recurring

3 years ago[Test] - Fix some tests to call API not BAO
eileen [Mon, 19 Oct 2020 04:56:12 +0000 (17:56 +1300)]
[Test] - Fix some tests to call API not BAO

3 years agoRemove instances of variable variables
eileen [Mon, 19 Oct 2020 01:42:09 +0000 (14:42 +1300)]
Remove instances of variable variables

Minor code readability tidy up covered by EntryTest:testProcessMembership

3 years agoFix sendconfirmation api to respect cc and bcc set in params
Jitendra Purohit [Sun, 11 Oct 2020 13:40:04 +0000 (19:10 +0530)]
Fix sendconfirmation api to respect cc and bcc set in params

3 years agoMerge pull request #18788 from civicrm/5.31
Eileen McNaughton [Sat, 17 Oct 2020 05:42:14 +0000 (18:42 +1300)]
Merge pull request #18788 from civicrm/5.31

5.31

3 years agoMerge pull request #18540 from eileenmcnaughton/paypal
Seamus Lee [Sat, 17 Oct 2020 01:44:35 +0000 (12:44 +1100)]
Merge pull request #18540 from eileenmcnaughton/paypal

dev/core#2034 Fix paypal standard cancel url

3 years agoMerge pull request #18766 from eileenmcnaughton/basic
Tim Otten [Sat, 17 Oct 2020 01:00:12 +0000 (18:00 -0700)]
Merge pull request #18766 from eileenmcnaughton/basic

Fix unreleased regression on search tasks from basic search

3 years agoMerge pull request #18773 from eileenmcnaughton/url
Monish Deb [Fri, 16 Oct 2020 12:14:07 +0000 (17:44 +0530)]
Merge pull request #18773 from eileenmcnaughton/url

dev/core#2066 Use shared function to set the next url

3 years agoMerge pull request #18783 from eileenmcnaughton/distinct
Monish Deb [Fri, 16 Oct 2020 12:12:00 +0000 (17:42 +0530)]
Merge pull request #18783 from eileenmcnaughton/distinct

dev/core#2066 Further cleanup on search actions

3 years agounit test for #18306 - order create api test for contribution
Jitendra Purohit [Wed, 7 Oct 2020 11:49:37 +0000 (17:19 +0530)]
unit test for #18306 - order create api test for contribution

3 years agodev/core#2066 Further cleanup on search actions
eileen [Fri, 16 Oct 2020 01:59:42 +0000 (14:59 +1300)]
dev/core#2066 Further cleanup on search actions

Most of the noise is in the shared pre-process code so my focus is on paring that down

3 years agoMerge pull request #17568 from agileware/CIVICRM-1496
Eileen McNaughton [Thu, 15 Oct 2020 23:52:29 +0000 (12:52 +1300)]
Merge pull request #17568 from agileware/CIVICRM-1496

Contribution confirmation page should not display the name of payment processor type

3 years agoMerge pull request #18778 from colemanw/plurals
Eileen McNaughton [Thu, 15 Oct 2020 22:12:53 +0000 (11:12 +1300)]
Merge pull request #18778 from colemanw/plurals

Fix pluralize function for words like 'display'

3 years agoFix pluralize function for words like 'display'
Coleman Watts [Thu, 15 Oct 2020 13:26:06 +0000 (09:26 -0400)]
Fix pluralize function for words like 'display'

3 years agoMerge pull request #18777 from civicrm/5.31
Eileen McNaughton [Thu, 15 Oct 2020 07:47:46 +0000 (20:47 +1300)]
Merge pull request #18777 from civicrm/5.31

5.31

3 years agoCIVICRM-1496 Reword text on the contribution confirmation page
Pengyi Zhang [Wed, 10 Jun 2020 05:52:21 +0000 (15:52 +1000)]
CIVICRM-1496 Reword text on the contribution confirmation page

3 years agoMerge pull request #18776 from seamuslee001/dev_core_2125
Eileen McNaughton [Thu, 15 Oct 2020 04:46:42 +0000 (17:46 +1300)]
Merge pull request #18776 from seamuslee001/dev_core_2125

dev/core#2125 Ensure that the id that is used in the field is the gro…

3 years agoMerge pull request #18775 from colemanw/searchRefactor
Eileen McNaughton [Thu, 15 Oct 2020 03:59:23 +0000 (16:59 +1300)]
Merge pull request #18775 from colemanw/searchRefactor

[REF] Search ext: Reorganize code into modules

3 years agodev/core#2125 Ensure that the id that is used in the field is the group id not the...
Seamus Lee [Thu, 15 Oct 2020 00:37:47 +0000 (11:37 +1100)]
dev/core#2125 Ensure that the id that is used in the field is the group id not the id of array key as that has changed from being a keyed array to a 2D array

3 years agoMerge pull request #18411 from MegaphoneJon/pcp-wysiwyg
Eileen McNaughton [Wed, 14 Oct 2020 23:44:39 +0000 (12:44 +1300)]
Merge pull request #18411 from MegaphoneJon/pcp-wysiwyg

CRM-9362: PCP 'Your Message' should use WYSIWYG

3 years agoMerge pull request #18400 from aydun/class_api_tweak_2
Seamus Lee [Wed, 14 Oct 2020 23:41:28 +0000 (10:41 +1100)]
Merge pull request #18400 from aydun/class_api_tweak_2

class.api.php: In remote api calls, allow referer and useragent to be set.

3 years agoMerge pull request #18774 from civicrm/5.31
Eileen McNaughton [Wed, 14 Oct 2020 22:40:53 +0000 (11:40 +1300)]
Merge pull request #18774 from civicrm/5.31

5.31 to master

3 years agoMerge pull request #18765 from totten/5.31-res-alias
Eileen McNaughton [Wed, 14 Oct 2020 22:40:28 +0000 (11:40 +1300)]
Merge pull request #18765 from totten/5.31-res-alias

dev/core#2117 - Add compatibility aliases for 'scriptFile' and 'styleFile' resources

3 years agoMerge pull request #18761 from MegaphoneJon/event43-test
Seamus Lee [Wed, 14 Oct 2020 19:56:25 +0000 (06:56 +1100)]
Merge pull request #18761 from MegaphoneJon/event43-test

Test for event#43

3 years agodev/core#2066 Use shared function to set the next url
eileen [Wed, 14 Oct 2020 19:55:57 +0000 (08:55 +1300)]
dev/core#2066 Use shared function to set the next url

Extends https://github.com/civicrm/civicrm-core/pull/18767 to more places

3 years agoSearch ext: Support is_deleted field but not api_key or hash
Coleman Watts [Wed, 14 Oct 2020 19:53:34 +0000 (15:53 -0400)]
Search ext: Support is_deleted field but not api_key or hash

3 years agoSearch ext: Add settingsCallback to searchAdmin module
Coleman Watts [Tue, 13 Oct 2020 21:47:38 +0000 (17:47 -0400)]
Search ext: Add settingsCallback to searchAdmin module

3 years agoSearch ext: Reorganize into searchAdmin and searchActions modules
Coleman Watts [Tue, 13 Oct 2020 15:54:36 +0000 (11:54 -0400)]
Search ext: Reorganize into searchAdmin and searchActions modules

3 years agoMerge pull request #18770 from civicrm/5.31
Eileen McNaughton [Wed, 14 Oct 2020 09:48:33 +0000 (22:48 +1300)]
Merge pull request #18770 from civicrm/5.31

5.31

3 years agoMerge pull request #18768 from eileenmcnaughton/ids
Matthew Wire [Wed, 14 Oct 2020 09:38:41 +0000 (10:38 +0100)]
Merge pull request #18768 from eileenmcnaughton/ids

dev/core#2066 Extract getSelectedIDs

3 years agoMerge pull request #18767 from eileenmcnaughton/task
Matthew Wire [Wed, 14 Oct 2020 09:37:50 +0000 (10:37 +0100)]
Merge pull request #18767 from eileenmcnaughton/task

dev/core#2066 Use shared function to set the next url

3 years agoMerge pull request #18763 from eileenmcnaughton/531
Seamus Lee [Wed, 14 Oct 2020 09:06:50 +0000 (20:06 +1100)]
Merge pull request #18763 from eileenmcnaughton/531

dev/core#2119 Fix mailing code to exclude deleted recipients

3 years agoMerge pull request #18449 from colemanw/multiValueAutocomplete
Seamus Lee [Wed, 14 Oct 2020 09:06:05 +0000 (20:06 +1100)]
Merge pull request #18449 from colemanw/multiValueAutocomplete

Allow custom fields of type Autocomplete-Select to be multivalued

3 years agoMerge pull request #18764 from civicrm/5.31
Seamus Lee [Wed, 14 Oct 2020 08:59:09 +0000 (19:59 +1100)]
Merge pull request #18764 from civicrm/5.31

5.31

3 years agoMerge pull request #18581 from demeritcowboy/requirements-check
Seamus Lee [Wed, 14 Oct 2020 08:58:27 +0000 (19:58 +1100)]
Merge pull request #18581 from demeritcowboy/requirements-check

dev/drupal#137 - Alternate PR - On drupal status report need different check when civi is already installed

3 years agodev/core#2066 Extract getSelectedIDs
eileen [Wed, 14 Oct 2020 04:19:22 +0000 (17:19 +1300)]
dev/core#2066 Extract getSelectedIDs

3 years agodev/core#2066 Use shared function to set the next url
eileen [Wed, 14 Oct 2020 04:09:07 +0000 (17:09 +1300)]
dev/core#2066 Use shared function to set the next url

Reduces copy & paste - there are some more places like this to sort out after ....

3 years agoFix unreleased regression on search tasks from basic search
eileen [Wed, 14 Oct 2020 03:41:19 +0000 (16:41 +1300)]
Fix unreleased regression on search tasks from basic search

3 years agoTest for event#43
Jon Goldberg [Tue, 13 Oct 2020 23:10:25 +0000 (19:10 -0400)]
Test for event#43

3 years agoMerge pull request #18762 from demeritcowboy/all-ALL
Seamus Lee [Wed, 14 Oct 2020 01:59:46 +0000 (12:59 +1100)]
Merge pull request #18762 from demeritcowboy/all-ALL

Typo in call to fixSchemaDifferencesForAll

3 years agoMerge pull request #18758 from mlutfy/event43rc
Seamus Lee [Wed, 14 Oct 2020 01:58:44 +0000 (12:58 +1100)]
Merge pull request #18758 from mlutfy/event43rc

dev/event#43 Contact Dashboard: fix Event Participations

3 years agodev/core#2119 Fix mailig code to exclude deleted recipients
eileen [Wed, 14 Oct 2020 01:51:04 +0000 (14:51 +1300)]
dev/core#2119 Fix mailig code to exclude deleted recipients

3 years agodev/core#2117 - scriptFile, styleFile - Automatically register URL aliases
Tim Otten [Wed, 14 Oct 2020 00:29:29 +0000 (17:29 -0700)]
dev/core#2117 - scriptFile, styleFile - Automatically register URL aliases

This allows backward compatibility for customizations which targetted these
resources by their URL.

3 years agodev/core#2117 - Resources - Allow each snippet to have `aliases`
Tim Otten [Wed, 14 Oct 2020 01:24:47 +0000 (18:24 -0700)]
dev/core#2117 - Resources - Allow each snippet to have `aliases`

__Before__: Every snippet/resource has a singular name. If the name ever changes,
it becomes a backward-compatibility break.

__After__: Every snippet/resource has a singular name, and it may optionally
have a list of aliases.  If the name ever changes, you can leave an alias
for backward-compatibility.

3 years agomake sure we're `all` on the same page
demeritcowboy [Tue, 13 Oct 2020 23:21:01 +0000 (19:21 -0400)]
make sure we're `all` on the same page

3 years agoMerge pull request #18757 from civicrm/5.31
Eileen McNaughton [Tue, 13 Oct 2020 23:07:09 +0000 (12:07 +1300)]
Merge pull request #18757 from civicrm/5.31

5.31

3 years agoMerge pull request #18754 from colemanw/angularPerms
Tim Otten [Tue, 13 Oct 2020 22:01:52 +0000 (15:01 -0700)]
Merge pull request #18754 from colemanw/angularPerms

Angular Loader: Allow modules to specify permissions to add client-side

3 years agodev/event#43 Contact Dashboard: fix Event Participations
Mathieu Lutfy [Tue, 13 Oct 2020 19:51:58 +0000 (15:51 -0400)]
dev/event#43 Contact Dashboard: fix Event Participations

3 years agoMerge pull request #18753 from agh1/placeholderfix-5.31
Seamus Lee [Tue, 13 Oct 2020 20:08:28 +0000 (07:08 +1100)]
Merge pull request #18753 from agh1/placeholderfix-5.31

dev/core#2118 supply better automatic placeholders for select (5.31 intra-rc)

3 years agoMerge pull request #18756 from civicrm/5.31
Eileen McNaughton [Tue, 13 Oct 2020 20:04:00 +0000 (09:04 +1300)]
Merge pull request #18756 from civicrm/5.31

5.31 to master

3 years agoMerge pull request #18751 from demeritcowboy/utf8convert-triggers
Eileen McNaughton [Tue, 13 Oct 2020 20:03:35 +0000 (09:03 +1300)]
Merge pull request #18751 from demeritcowboy/utf8convert-triggers

Rebuild triggers after utf8mb4 conversion

3 years agoMerge pull request #18750 from eileenmcnaughton/weird
Eileen McNaughton [Tue, 13 Oct 2020 19:14:33 +0000 (08:14 +1300)]
Merge pull request #18750 from eileenmcnaughton/weird

Extract setNextUrl

3 years agoAngular Loader: Allow modules to specify permissions to add client-side
Coleman Watts [Tue, 13 Oct 2020 12:52:34 +0000 (08:52 -0400)]
Angular Loader: Allow modules to specify permissions to add client-side

3 years agoMerge pull request #18749 from totten/master-crmMailing-factory
colemanw [Tue, 13 Oct 2020 16:37:40 +0000 (12:37 -0400)]
Merge pull request #18749 from totten/master-crmMailing-factory

crmMailing - Only load Angular settings if they're needed

3 years agodev/core#2118 supply better automatic placeholders for select
Andrew Hunt [Tue, 13 Oct 2020 16:15:38 +0000 (12:15 -0400)]
dev/core#2118 supply better automatic placeholders for select

3 years agorebuild triggers after utf8mb4 conversion
demeritcowboy [Tue, 13 Oct 2020 15:14:39 +0000 (11:14 -0400)]
rebuild triggers after utf8mb4 conversion

3 years agoMerge pull request #18721 from artfulrobot/artfulrobot-relcache-utf8
colemanw [Tue, 13 Oct 2020 15:14:15 +0000 (11:14 -0400)]
Merge pull request #18721 from artfulrobot/artfulrobot-relcache-utf8

Remove explicit COLLATE utf8_bin from RelationshipCache trigger

3 years agoCRM_Mailing_Info - Init Angular data via `settingsFactory` instead of `settings`
Tim Otten [Tue, 13 Oct 2020 02:53:27 +0000 (19:53 -0700)]
CRM_Mailing_Info - Init Angular data via `settingsFactory` instead of `settings`

3 years agoCRM_Mailing_Info - Extract method 'createAngularSettings()'
Tim Otten [Tue, 13 Oct 2020 02:52:09 +0000 (19:52 -0700)]
CRM_Mailing_Info - Extract method 'createAngularSettings()'

3 years agoMerge pull request #18731 from colemanw/angularSettingsFactory
colemanw [Tue, 13 Oct 2020 12:04:56 +0000 (08:04 -0400)]
Merge pull request #18731 from colemanw/angularSettingsFactory

AngularLoader: Support 'settingsFactory' callbacks in angular modules.

3 years agoReplace hard-coded utf8_bin with binary in-use collation
Rich Lott / Artful Robot [Tue, 13 Oct 2020 09:39:35 +0000 (10:39 +0100)]
Replace hard-coded utf8_bin with binary in-use collation

3 years agoExtract setNextUrl
eileen [Tue, 13 Oct 2020 07:05:59 +0000 (20:05 +1300)]
Extract setNextUrl

This code is repeated all over the task sub system. This is a first attempt to
extract it on the parent class in order to start consolidating it

3 years agoMerge pull request #18747 from eileenmcnaughton/aip2
Eileen McNaughton [Tue, 13 Oct 2020 02:07:05 +0000 (15:07 +1300)]
Merge pull request #18747 from eileenmcnaughton/aip2

[REF] Replace long if block with early return

3 years ago[REF] Replace long if block with early return
eileen [Mon, 12 Oct 2020 23:41:28 +0000 (12:41 +1300)]
[REF] Replace long if block with early return

3 years agoMerge pull request #18744 from eileenmcnaughton/aip
Seamus Lee [Mon, 12 Oct 2020 23:08:20 +0000 (10:08 +1100)]
Merge pull request #18744 from eileenmcnaughton/aip

dev/financial#152 simplify passed parameters

3 years agoMerge pull request #18743 from vingle/patch-9
Eileen McNaughton [Mon, 12 Oct 2020 22:26:01 +0000 (11:26 +1300)]
Merge pull request #18743 from vingle/patch-9

More accurate language around social media sharing

3 years agodev/financial#152 simplify passed parameters
eileen [Mon, 12 Oct 2020 20:33:08 +0000 (09:33 +1300)]
dev/financial#152 simplify passed parameters

Rather than passing objects this switches to specifically passing the 2 objects being used in
the recur function

3 years agoMerge pull request #18742 from jitendrapurohit/merge-uid
Seamus Lee [Mon, 12 Oct 2020 20:27:41 +0000 (07:27 +1100)]
Merge pull request #18742 from jitendrapurohit/merge-uid

Fix main contact uf url on merge screen

3 years agoMerge pull request #18738 from eileenmcnaughton/lines
Matthew Wire [Mon, 12 Oct 2020 20:12:45 +0000 (21:12 +0100)]
Merge pull request #18738 from eileenmcnaughton/lines

dev/core#2115 remove reference to financialACLs in bounce

3 years agoMerge pull request #18735 from eileenmcnaughton/aipn
Matthew Wire [Mon, 12 Oct 2020 20:11:44 +0000 (21:11 +0100)]
Merge pull request #18735 from eileenmcnaughton/aipn

dev/financial#152 simplify interaction with membership, deprecate function

3 years agoMerge pull request #18736 from eileenmcnaughton/pp
Matthew Wire [Mon, 12 Oct 2020 20:07:37 +0000 (21:07 +0100)]
Merge pull request #18736 from eileenmcnaughton/pp

dev/financial#152 simplify passed parameters

3 years agoMerge pull request #18668 from eileenmcnaughton/no_opt
Monish Deb [Mon, 12 Oct 2020 17:01:39 +0000 (22:31 +0530)]
Merge pull request #18668 from eileenmcnaughton/no_opt

dev/core#2079 Eliminate unused query on CRM_Core_BAO_CustomQuery::_construct

3 years agoMerge pull request #18589 from eileenmcnaughton/ex_class
Monish Deb [Mon, 12 Oct 2020 16:04:30 +0000 (21:34 +0530)]
Merge pull request #18589 from eileenmcnaughton/ex_class

[REF]  Separate export form classes out & simplify task handling

3 years agoChange in language
Nicol [Mon, 12 Oct 2020 14:42:23 +0000 (16:42 +0200)]
Change in language

Change in language to be more accurate, in relation to this issue: https://lab.civicrm.org/dev/user-interface/-/issues/21#note_48976.

3 years agoUpdate Petition.php
Nicol [Mon, 12 Oct 2020 14:39:34 +0000 (16:39 +0200)]
Update Petition.php

Change in language to be more accurate, in relation to this issue: https://lab.civicrm.org/dev/user-interface/-/issues/21#note_48976.

3 years agoMerge pull request #18555 from eileenmcnaughton/del_primary
Monish Deb [Mon, 12 Oct 2020 14:39:12 +0000 (20:09 +0530)]
Merge pull request #18555 from eileenmcnaughton/del_primary

dev/core#2047 Fix merge code so that deleted contacts are not left without a primary address

3 years agoUpdate Settings.php
Nicol [Mon, 12 Oct 2020 14:34:38 +0000 (16:34 +0200)]
Update Settings.php

Change in language to be more accurate, in relation to this issue: https://lab.civicrm.org/dev/user-interface/-/issues/21#note_48976.

3 years agoFix main contact uf url on merge screen
Jitendra Purohit [Mon, 12 Oct 2020 11:36:20 +0000 (17:06 +0530)]
Fix main contact uf url on merge screen

3 years ago[Ref] Minor code extraction
eileen [Sun, 11 Oct 2020 23:00:14 +0000 (12:00 +1300)]
[Ref] Minor code extraction

3 years agodev/core#2039 Fix merge code so that deleted contacts are not left without a primary...
eileen [Tue, 22 Sep 2020 02:43:29 +0000 (14:43 +1200)]
dev/core#2039 Fix merge code so that deleted contacts are not left without a primary address

This was picked up in tests to ensure that removing a line of code creating excessing queries
would not cause regressions.

https://lab.civicrm.org/dev/core/-/issues/2039

I considered altering the test to exclude deleted contacts but we run the risk that if a contact
is undeleted they will have no primary address so I figured the integrity makes sense.

Note there are a couple of queries in this code that can go (retrieving stuff
we already have) - depending how I go on getting review on this & related tidy up I'll remove them
in a later PR

3 years agoAngularLoader: Support 'settingsFactory' callbacks in angular modules.
Coleman Watts [Sat, 10 Oct 2020 20:58:17 +0000 (16:58 -0400)]
AngularLoader: Support 'settingsFactory' callbacks in angular modules.

This allows Angular modules with complex/expensive data to provide it with a callback,
which will only be invoked if the module is actively loaded on the page.

Normally, module settings are calculated on every page request, even if they are not needed.

3 years agoMerge pull request #18737 from eileenmcnaughton/ppp
Eileen McNaughton [Sun, 11 Oct 2020 23:03:34 +0000 (12:03 +1300)]
Merge pull request #18737 from eileenmcnaughton/ppp

dev/financial#152 remove unused parameter

3 years agodev/core#2115 remove reference to financialACLs in bounce
eileen [Sun, 11 Oct 2020 21:57:04 +0000 (10:57 +1300)]
dev/core#2115 remove reference to financialACLs in bounce

I believe that the other 2 criteria suffice. allMembershipDetails is built from
CRM_Member_BAO_Membership::buildMembershipTypeValues()  which is altered by
financial acls but also potentially by other extensions so I don't think the bounce
should be restricted to when financial acls are in play

3 years agodev/financial#152 remove unused parameter
eileen [Sun, 11 Oct 2020 21:15:28 +0000 (10:15 +1300)]
dev/financial#152 remove unused parameter

3 years agodev/financial#152 simplify passed parameters
eileen [Sun, 11 Oct 2020 21:07:40 +0000 (10:07 +1300)]
dev/financial#152 simplify passed parameters

the  function now only requires  so this simplifies so it only receives that