civicrm-core.git
2 years agoSearchKit - Add @searchFields metadata to specify default search display fields per...
colemanw [Mon, 21 Aug 2023 13:14:58 +0000 (09:14 -0400)]
SearchKit - Add @searchFields metadata to specify default search display fields per-entity

- Use Contact.sort_name instead of display_name for searches and Autocompletes
- Adds more useful fields by default to a new SearchKit display
- Makes use of new metadata to improve generated default Autocomplete display

2 years agoMerge pull request #27054 from colemanw/getFieldsFixes
Aidan Saunders [Tue, 22 Aug 2023 16:50:40 +0000 (17:50 +0100)]
Merge pull request #27054 from colemanw/getFieldsFixes

Schema - Improve pseudoconstant metadata for `prefetch` and `controlField`

2 years agoSchema - Add controlField tags where needed + test
colemanw [Fri, 11 Aug 2023 18:17:26 +0000 (14:17 -0400)]
Schema - Add controlField tags where needed + test

2 years agoMerge pull request #27117 from eileenmcnaughton/notice_a
colemanw [Tue, 22 Aug 2023 12:06:22 +0000 (08:06 -0400)]
Merge pull request #27117 from eileenmcnaughton/notice_a

Smarty-notice fix - use array_key_exists

2 years agoSmarty-notice fix - use array_key_exists
Eileen McNaughton [Tue, 22 Aug 2023 06:28:29 +0000 (18:28 +1200)]
Smarty-notice fix - use array_key_exists

2 years agoMerge pull request #27091 from eileenmcnaughton/alt_8x
Eileen McNaughton [Tue, 22 Aug 2023 06:14:36 +0000 (18:14 +1200)]
Merge pull request #27091 from eileenmcnaughton/alt_8x

php8.x fatal fix + bonus smarty consistency

2 years agoMerge pull request #27116 from colemanw/search_autocomplete_count
Eileen McNaughton [Tue, 22 Aug 2023 06:12:26 +0000 (18:12 +1200)]
Merge pull request #27116 from colemanw/search_autocomplete_count

Bump search_autocomplete_count default from 10 to 15

2 years agoMerge pull request #27017 from eileenmcnaughton/register
Eileen McNaughton [Tue, 22 Aug 2023 06:10:55 +0000 (18:10 +1200)]
Merge pull request #27017 from eileenmcnaughton/register

Use tokens for participant.register_date

2 years agoBump search_autocomplete_count default from 10 to 15
colemanw [Mon, 21 Aug 2023 23:59:03 +0000 (19:59 -0400)]
Bump search_autocomplete_count default from 10 to 15

2 years agoMerge pull request #27110 from briennekordis/afform_note
Seamus Lee [Mon, 21 Aug 2023 22:47:45 +0000 (18:47 -0400)]
Merge pull request #27110 from briennekordis/afform_note

add Note as an afformEntity

2 years agoMerge pull request #27109 from colemanw/api4Suffixes
colemanw [Mon, 21 Aug 2023 20:06:23 +0000 (16:06 -0400)]
Merge pull request #27109 from colemanw/api4Suffixes

APIv4 Explorer - Keep list of suffixes in-sync

2 years agoMerge pull request #27108 from colemanw/afformSubmissionOptions
colemanw [Mon, 21 Aug 2023 20:04:44 +0000 (16:04 -0400)]
Merge pull request #27108 from colemanw/afformSubmissionOptions

Afform - Enhance returned values from AfformSubmission.afform_name options

2 years agoadd Note as an afformEntity
brienne [Fri, 11 Aug 2023 17:07:03 +0000 (13:07 -0400)]
add Note as an afformEntity

make afformEntity a join

join Note to Contact Entity

2 years agoAPIv4 Explorer - Keep list of suffixes in-sync
colemanw [Mon, 21 Aug 2023 18:05:19 +0000 (14:05 -0400)]
APIv4 Explorer - Keep list of suffixes in-sync

2 years agoAfform - Enhance returned values from AfformSubmission.afform_name options list
colemanw [Mon, 21 Aug 2023 17:56:19 +0000 (13:56 -0400)]
Afform - Enhance returned values from AfformSubmission.afform_name options list

2 years agoMerge pull request #27106 from eileenmcnaughton/note
Yashodha Chaku [Mon, 21 Aug 2023 08:04:38 +0000 (13:34 +0530)]
Merge pull request #27106 from eileenmcnaughton/note

Set weight on Note Form

2 years agoSet weight on Note Form
Eileen McNaughton [Mon, 21 Aug 2023 01:33:14 +0000 (13:33 +1200)]
Set weight on Note Form

2 years agoMerge pull request #27103 from larssandergreen/Make-import-parser-cid-/-eid-error...
Mathieu Lu [Sun, 20 Aug 2023 23:33:08 +0000 (19:33 -0400)]
Merge pull request #27103 from larssandergreen/Make-import-parser-cid-/-eid-error-more-useful

Make import parser external ID error message more helpful

2 years agoApi4 getFields - Fix 'prefetch' boolean which was not a boolean; might as well make...
colemanw [Fri, 11 Aug 2023 00:31:03 +0000 (20:31 -0400)]
Api4 getFields - Fix 'prefetch' boolean which was not a boolean; might as well make it a string

2 years agoAPIv4 getFields - Declare missing 'permission' prop
colemanw [Thu, 10 Aug 2023 22:00:16 +0000 (18:00 -0400)]
APIv4 getFields - Declare missing 'permission' prop

2 years agoMerge pull request #27102 from demeritcowboy/windows-childpath
Tim Otten [Sun, 20 Aug 2023 04:37:13 +0000 (21:37 -0700)]
Merge pull request #27102 from demeritcowboy/windows-childpath

windows fix for CRM_Utils_File::isChildPath

2 years agoMake import parser external ID error message more helpful
larssandergreen [Sun, 20 Aug 2023 03:15:59 +0000 (21:15 -0600)]
Make import parser external ID error message more helpful

2 years agoMerge pull request #27093 from seamuslee001/fix_domain_id_filtering_link_search_kit
colemanw [Sun, 20 Aug 2023 00:50:05 +0000 (20:50 -0400)]
Merge pull request #27093 from seamuslee001/fix_domain_id_filtering_link_search_kit

dev/core#4509 Fix link conditionals when using current_domain for dom…

2 years agoMerge pull request #27101 from totten/master-sched-unit9
demeritcowboy [Sun, 20 Aug 2023 00:29:49 +0000 (20:29 -0400)]
Merge pull request #27101 from totten/master-sched-unit9

ActionScheduleTest - Update for compatibility with PHPUnit 9

2 years agowindows fix
demeritcowboy [Sun, 20 Aug 2023 00:07:49 +0000 (20:07 -0400)]
windows fix

2 years agoActionScheduleTest - Update for compatibility with PHPUnit 9
Tim Otten [Sat, 19 Aug 2023 23:17:36 +0000 (16:17 -0700)]
ActionScheduleTest - Update for compatibility with PHPUnit 9

2 years agodev/core#4509 Fix link conditionals when using current_domain for domain_id columns
Seamus Lee [Fri, 18 Aug 2023 02:41:12 +0000 (12:41 +1000)]
dev/core#4509 Fix link conditionals when using current_domain for domain_id columns

2 years agoMerge pull request #27099 from cdhassell/master-1
Tim Otten [Sat, 19 Aug 2023 22:28:43 +0000 (15:28 -0700)]
Merge pull request #27099 from cdhassell/master-1

Fix Standalone error handler: remove 5th argument

2 years agoUpdate index.php.txt to remove 5th argument
cdhassell [Sat, 19 Aug 2023 12:49:47 +0000 (08:49 -0400)]
Update index.php.txt to remove 5th argument

Prevents PHP error: Uncaught ArgumentCountError: Too few arguments to function standaloneErrorHandler()

2 years agoMerge pull request #27097 from demeritcowboy/emailprocessor-tests
demeritcowboy [Sat, 19 Aug 2023 02:48:32 +0000 (22:48 -0400)]
Merge pull request #27097 from demeritcowboy/emailprocessor-tests

[NFC] Add some email processor hooks tests

2 years agowip
demeritcowboy [Tue, 8 Aug 2023 19:54:20 +0000 (15:54 -0400)]
wip

2 years agoMerge pull request #26905 from larssandergreen/More-inbound-email-processing-options
demeritcowboy [Sat, 19 Aug 2023 01:25:33 +0000 (21:25 -0400)]
Merge pull request #26905 from larssandergreen/More-inbound-email-processing-options

Allow for configuration of activity contacts, type and campaign for email-to-activity

2 years agoAllow for configuration of activity details from email to activity
larssandergreen [Sat, 19 Aug 2023 00:29:15 +0000 (18:29 -0600)]
Allow for configuration of activity details from email to activity

2 years agoMerge pull request #26952 from eileenmcnaughton/no_late_assign
Seamus Lee [Fri, 18 Aug 2023 21:49:43 +0000 (17:49 -0400)]
Merge pull request #26952 from eileenmcnaughton/no_late_assign

Remove unusable assigns (copy & paste I believe)

2 years agoMerge pull request #27095 from larssandergreen/Fix-Manage-Events-breadcrumb-regression
demeritcowboy [Fri, 18 Aug 2023 20:50:42 +0000 (16:50 -0400)]
Merge pull request #27095 from larssandergreen/Fix-Manage-Events-breadcrumb-regression

Fix Manage Events breadcrumb regression

2 years agoFix Manage Events breadcrumb regression
larssandergreen [Fri, 18 Aug 2023 19:54:09 +0000 (13:54 -0600)]
Fix Manage Events breadcrumb regression

2 years agoMerge pull request #23312 from bhahumanists/smartgroupdata
colemanw [Fri, 18 Aug 2023 19:37:06 +0000 (15:37 -0400)]
Merge pull request #23312 from bhahumanists/smartgroupdata

Add custom data when creating smart group

2 years agoMerge pull request #27040 from mlutfy/core4425a
colemanw [Fri, 18 Aug 2023 19:03:55 +0000 (15:03 -0400)]
Merge pull request #27040 from mlutfy/core4425a

dev/core#4425 Override currentPath for Standalone

2 years agoMerge pull request #27058 from colemanw/afformEventTemplate
Mathieu Lu [Fri, 18 Aug 2023 18:08:22 +0000 (14:08 -0400)]
Merge pull request #27058 from colemanw/afformEventTemplate

Afform - Enable creating event from a template

2 years agoMerge pull request #26965 from artfulrobot/standalone-error-handler
Mathieu Lu [Fri, 18 Aug 2023 15:33:33 +0000 (11:33 -0400)]
Merge pull request #26965 from artfulrobot/standalone-error-handler

standalone: add error handler

2 years agoMerge pull request #27076 from Damilare1/master
Eileen McNaughton [Fri, 18 Aug 2023 04:55:28 +0000 (16:55 +1200)]
Merge pull request #27076 from Damilare1/master

Fix #4467 - Import caching issue

2 years agoMerge pull request #27092 from eileenmcnaughton/price_p
Seamus Lee [Fri, 18 Aug 2023 03:39:14 +0000 (23:39 -0400)]
Merge pull request #27092 from eileenmcnaughton/price_p

Pass in function values, rather than handling by form-name

2 years agoPass in function values, rather than handling by form-name
Eileen McNaughton [Fri, 18 Aug 2023 01:31:39 +0000 (13:31 +1200)]
Pass in function values, rather than handling by form-name

2 years agoMerge pull request #27069 from eileenmcnaughton/fee_block_2
Seamus Lee [Fri, 18 Aug 2023 01:32:00 +0000 (21:32 -0400)]
Merge pull request #27069 from eileenmcnaughton/fee_block_2

Move form specific code to relevant form (rather than access mostly-undeclared property)

2 years agoMerge pull request #27077 from kurund/profile-fatal-fixes
Eileen McNaughton [Fri, 18 Aug 2023 00:51:23 +0000 (12:51 +1200)]
Merge pull request #27077 from kurund/profile-fatal-fixes

fatal error fixes in PHP 8.1

2 years agophp8.x fatal fix
Eileen McNaughton [Fri, 18 Aug 2023 00:44:40 +0000 (12:44 +1200)]
php8.x fatal fix

2 years agoMerge pull request #27082 from civicrm/5.65
Eileen McNaughton [Fri, 18 Aug 2023 00:41:24 +0000 (12:41 +1200)]
Merge pull request #27082 from civicrm/5.65

5.65

2 years agoMerge pull request #27088 from seamuslee001/dev_core_4472
Eileen McNaughton [Fri, 18 Aug 2023 00:41:08 +0000 (12:41 +1200)]
Merge pull request #27088 from seamuslee001/dev_core_4472

dev/core#4472 Drop Index that is not actually needed only recently ad…

2 years agoMerge pull request #27090 from eileenmcnaughton/manage_event
Eileen McNaughton [Fri, 18 Aug 2023 00:38:26 +0000 (12:38 +1200)]
Merge pull request #27090 from eileenmcnaughton/manage_event

Fix undeclared property - use locally scoped variable

2 years agoMove form-specific early return to form
Eileen McNaughton [Mon, 14 Aug 2023 00:13:41 +0000 (12:13 +1200)]
Move form-specific early return to form

2 years agoMerge pull request #27070 from eileenmcnaughton/quick
Eileen McNaughton [Fri, 18 Aug 2023 00:12:05 +0000 (12:12 +1200)]
Merge pull request #27070 from eileenmcnaughton/quick

Remove use of sometimes-php8-warning causing `_quickConfig` property…(use `isQuickConfig()` function)

2 years agoFix undeclared property - use locally scoped variable
Eileen McNaughton [Thu, 17 Aug 2023 23:24:39 +0000 (11:24 +1200)]
Fix undeclared property - use locally scoped variable

2 years agodev/core#4472 Drop Index that is not actually needed only recently added for priority...
Seamus Lee [Thu, 17 Aug 2023 21:52:21 +0000 (07:52 +1000)]
dev/core#4472 Drop Index that is not actually needed only recently added for priority column on civicrm_acl table

2 years agoMerge pull request #27083 from seamuslee001/followup_price_set_extends
Seamus Lee [Thu, 17 Aug 2023 22:28:58 +0000 (18:28 -0400)]
Merge pull request #27083 from seamuslee001/followup_price_set_extends

Follow up to ensure we are excluding quick config price sets as per t…

2 years agoFollow up to ensure we are excluding quick config price sets as per the previous...
Seamus Lee [Thu, 17 Aug 2023 21:25:10 +0000 (07:25 +1000)]
Follow up to ensure we are excluding quick config price sets as per the previous function

2 years agoFurther test fix
Eileen McNaughton [Mon, 14 Aug 2023 02:33:53 +0000 (14:33 +1200)]
Further test fix

2 years agoRemove use of sometimes-php8-warning causing _quickFonconfig property (use isQuickCon...
Eileen McNaughton [Mon, 14 Aug 2023 01:19:35 +0000 (13:19 +1200)]
Remove use of sometimes-php8-warning causing _quickFonconfig property (use isQuickConfig() function)

2 years agoMerge pull request #27049 from eileenmcnaughton/discount
Seamus Lee [Thu, 17 Aug 2023 21:22:29 +0000 (17:22 -0400)]
Merge pull request #27049 from eileenmcnaughton/discount

Extract `getDiscountID()`

2 years agoMerge pull request #27080 from seamuslee001/amount_tab_extends_fix
Eileen McNaughton [Thu, 17 Aug 2023 21:19:28 +0000 (09:19 +1200)]
Merge pull request #27080 from seamuslee001/amount_tab_extends_fix

[REF] Fix poor checking of extends field as per PR #27079 but this ti…

2 years agoMerge pull request #27079 from briennekordis/price_set_extends_api
Seamus Lee [Thu, 17 Aug 2023 21:18:37 +0000 (17:18 -0400)]
Merge pull request #27079 from briennekordis/price_set_extends_api

Use APIv4 to check if a PriceSet extends CiviMember (lab.civicrm issue 4486)

2 years agoMerge pull request #27071 from seamuslee001/dev_core_4498
Seamus Lee [Thu, 17 Aug 2023 21:12:30 +0000 (17:12 -0400)]
Merge pull request #27071 from seamuslee001/dev_core_4498

dev/core#4498 Ensure that users without administer civicrm permission…

2 years agoFix: Import caching issue
Damilare Adedoyin [Wed, 16 Aug 2023 13:37:24 +0000 (14:37 +0100)]
Fix: Import caching issue

Gitlab: https://lab.civicrm.org/dev/core/-/issues/4467

2 years agoAfform - Enable creating event from a template
colemanw [Sat, 12 Aug 2023 19:09:24 +0000 (15:09 -0400)]
Afform - Enable creating event from a template

This expands autofill functionality to work with create actions in addition to update.

2 years ago[REF] Fix poor checking of extends field as per PR #27079 but this time on the Amount...
Seamus Lee [Wed, 16 Aug 2023 22:52:34 +0000 (08:52 +1000)]
[REF] Fix poor checking of extends field as per PR #27079 but this time on the Amounts tab of the contribution page config

2 years agomembership price fix with API from 5.65
brienne [Wed, 16 Aug 2023 21:23:38 +0000 (17:23 -0400)]
membership price fix with API from 5.65

2 years agofatal error fixes in PHP 8.1
Kurund Jalmi [Wed, 16 Aug 2023 15:47:10 +0000 (16:47 +0100)]
fatal error fixes in PHP 8.1

2 years agoMerge pull request #27075 from totten/5.65-null-comp
Mathieu Lu [Wed, 16 Aug 2023 14:16:16 +0000 (10:16 -0400)]
Merge pull request #27075 from totten/5.65-null-comp

FiveSixtyTwo - Fix upgrade for domains with default value of `enable_components`

2 years agoFiveSixtyTwo - Fix upgrade for domains with default value of `enable_components`
Tim Otten [Wed, 16 Aug 2023 02:19:23 +0000 (19:19 -0700)]
FiveSixtyTwo - Fix upgrade for domains with default value of `enable_components`

2 years agoMerge pull request #27003 from colemanw/actionScheduleForm
Tim Otten [Tue, 15 Aug 2023 19:44:59 +0000 (12:44 -0700)]
Merge pull request #27003 from colemanw/actionScheduleForm

ScheduledReminders - Rewrite entire form using metadata

2 years agoMerge pull request #27072 from totten/master-test-d10
demeritcowboy [Tue, 15 Aug 2023 13:26:39 +0000 (09:26 -0400)]
Merge pull request #27072 from totten/master-test-d10

Concurrency Tests - Update ExternalBatch for symfony/proces v4.1+ (esp Drupal 10)

2 years agoMerge pull request #27074 from civicrm/5.65
demeritcowboy [Tue, 15 Aug 2023 13:16:57 +0000 (09:16 -0400)]
Merge pull request #27074 from civicrm/5.65

5.65

2 years agoMerge pull request #27066 from eileenmcnaughton/565
demeritcowboy [Tue, 15 Aug 2023 11:59:56 +0000 (07:59 -0400)]
Merge pull request #27066 from eileenmcnaughton/565

dev/core#4494 Fix e-notice by removing unused variables

2 years agoConcurrency Tests - Update ExternalBatch for symfony/proces v4.1+
Tim Otten [Tue, 15 Aug 2023 00:01:20 +0000 (17:01 -0700)]
Concurrency Tests - Update ExternalBatch for symfony/proces v4.1+

Before
------

`api_v3_JobProcessMailingTest::testConcurrency()` and `Civi\FlexMailer\ConcurrencyTest`
fail when executed on Drupal 10.

After
-----

Pass when executed on Drupal 10

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

`symfony/process` v4.1 deprecated the usage of `new Process(string)` and
added `Process::fromShellCommandline(string)`. The `new Process(string)` was
dropped from v5.x and v6.x. So you get an unconditional failure on D10. (On
other platforms, it can also fail... depending on how you deal with
deprecations.)

In `civicrm-core:composer.json`, the minimum mversion of `symfony/process` is `4.4`.
So that means we can use the newer `Process::fromShellCommandline(string)`.

2 years agodev/core#4498 Ensure that users without administer civicrm permission can use the...
Seamus Lee [Mon, 14 Aug 2023 21:46:28 +0000 (07:46 +1000)]
dev/core#4498 Ensure that users without administer civicrm permission can use the Mailing Autocomplete

2 years agoMerge pull request #27013 from eileenmcnaughton/auth
Mathieu Lu [Mon, 14 Aug 2023 20:12:17 +0000 (16:12 -0400)]
Merge pull request #27013 from eileenmcnaughton/auth

Fix permission check on Contribution form, clarify underlying functions

2 years agoMerge pull request #27068 from eileenmcnaughton/fee_block
Seamus Lee [Mon, 14 Aug 2023 03:42:59 +0000 (23:42 -0400)]
Merge pull request #27068 from eileenmcnaughton/fee_block

Move form-specific check to form

2 years agoMerge pull request #27067 from eileenmcnaughton/form_test_fix
Seamus Lee [Mon, 14 Aug 2023 01:43:20 +0000 (21:43 -0400)]
Merge pull request #27067 from eileenmcnaughton/form_test_fix

Test fix, towards full form flow

2 years agoMove form-specific check to form
Eileen McNaughton [Sun, 13 Aug 2023 23:58:29 +0000 (11:58 +1200)]
Move form-specific check to form

2 years agoTest fix, towards full form flow
Eileen McNaughton [Sun, 13 Aug 2023 23:12:17 +0000 (11:12 +1200)]
Test fix, towards full form flow

Rather than set _isQuickConfig it should be loaded from the db by the form
(which this switches to)

2 years agoMerge pull request #27060 from colemanw/dontGetFields
Eileen McNaughton [Sun, 13 Aug 2023 23:00:01 +0000 (11:00 +1200)]
Merge pull request #27060 from colemanw/dontGetFields

Api4 - Remove unused key from getFields

2 years agodev/core#4494 Fix e-notice by removing unused variables
Eileen McNaughton [Sun, 13 Aug 2023 22:53:28 +0000 (10:53 +1200)]
dev/core#4494 Fix e-notice by removing unused variables

2 years agoMerge pull request #27063 from eileenmcnaughton/context
Tim Otten [Sun, 13 Aug 2023 21:10:24 +0000 (14:10 -0700)]
Merge pull request #27063 from eileenmcnaughton/context

Do the todo (move the function to the trait as suggested

2 years agoMerge pull request #27042 from colemanw/copyPastaFix
demeritcowboy [Sun, 13 Aug 2023 11:57:47 +0000 (06:57 -0500)]
Merge pull request #27042 from colemanw/copyPastaFix

[REF] SearchKit - Cleanup upgrade code

2 years agoMerge pull request #27064 from eileenmcnaughton/remove_notice
Monish Deb [Sun, 13 Aug 2023 05:31:56 +0000 (11:01 +0530)]
Merge pull request #27064 from eileenmcnaughton/remove_notice

Remove line that gives error & does nothing

2 years agoMerge pull request #27008 from colemanw/booleanSearch
Monish Deb [Sun, 13 Aug 2023 05:29:13 +0000 (10:59 +0530)]
Merge pull request #27008 from colemanw/booleanSearch

Simplify queries of NOT NULL fields

2 years agoRemove line that gives error & does nothing
Eileen McNaughton [Sun, 13 Aug 2023 00:08:35 +0000 (12:08 +1200)]
Remove line that gives error & does nothing

I went back to 5.55 & did receipt testing and
1) this notice is there already back then
2) it results in a resolved value of 'Array - Display name
3) it does not appear anywhere in the final receipt

2 years agoMerge pull request #27061 from demeritcowboy/searchevent-title
colemanw [Sun, 13 Aug 2023 00:04:43 +0000 (20:04 -0400)]
Merge pull request #27061 from demeritcowboy/searchevent-title

Manage event - fix too many brackets

2 years agoDo the todo (move the function to the trait as suggested
Eileen McNaughton [Sat, 12 Aug 2023 22:53:59 +0000 (10:53 +1200)]
Do the todo (move the function to the trait as suggested

This makes the currency of the contribution available to the template
for other templates - notably offline event receipts

2 years agoMerge pull request #27062 from civicrm/5.65
Seamus Lee [Sat, 12 Aug 2023 22:30:11 +0000 (18:30 -0400)]
Merge pull request #27062 from civicrm/5.65

5.65

2 years agoAdd test + external support for getAuthenticatedContactID()
Eileen McNaughton [Sat, 12 Aug 2023 21:54:29 +0000 (09:54 +1200)]
Add test + external support for getAuthenticatedContactID()

2 years agoFix permission check on Contribution form, clarify underlying functions
Eileen McNaughton [Sun, 6 Aug 2023 23:29:47 +0000 (11:29 +1200)]
Fix permission check on Contribution form, clarify underlying functions

This is a reviewer response to https://github.com/civicrm/civicrm-core/pull/22951

In that PR it seeks to set UserID to something derived from a function that is doing
a lot of work. I dug into that function which someone (ahem) wrote many years ago
and teased out some of the underlying chunks & cleaned up the variable names for clarity
along with a doc block cleanup.

I decided that rather than set _userID in contributionBase we should remove it
(it is only referred to in 4 places) and call the more specific function at each usage.

Otherwise we change the meaning of userID that is used somewhat differently later.

Also I rather prefer functions that will perform the same whenever called over relying
on a variable having been set correctly the first time

2 years agoMerge pull request #27005 from eileenmcnaughton/end_date
demeritcowboy [Sat, 12 Aug 2023 20:30:45 +0000 (15:30 -0500)]
Merge pull request #27005 from eileenmcnaughton/end_date

Fix event templates to use end_date token

2 years agoApi4 - Remove unused key from getFields
colemanw [Sat, 12 Aug 2023 19:56:26 +0000 (15:56 -0400)]
Api4 - Remove unused key from getFields

2 years agotoo many brackets
demeritcowboy [Sat, 12 Aug 2023 19:52:01 +0000 (15:52 -0400)]
too many brackets

2 years agoMerge pull request #27057 from larssandergreen/Fix-event-fee-help
colemanw [Sat, 12 Aug 2023 14:58:30 +0000 (10:58 -0400)]
Merge pull request #27057 from larssandergreen/Fix-event-fee-help

Fix event fee help

2 years agoFix event fee help
larssandergreen [Sat, 12 Aug 2023 04:47:54 +0000 (22:47 -0600)]
Fix event fee help

2 years agoMerge pull request #27056 from larssandergreen/Use-statusBounce-instead-of-redirect...
Eileen McNaughton [Sat, 12 Aug 2023 03:41:48 +0000 (15:41 +1200)]
Merge pull request #27056 from larssandergreen/Use-statusBounce-instead-of-redirect-when-can't-delete-custom-group

dev/core#4094 Use statusBounce instead of redirect when cannot delete custom group

2 years agoMerge pull request #27052 from totten/master-data-nonphp
Eileen McNaughton [Sat, 12 Aug 2023 02:23:10 +0000 (14:23 +1200)]
Merge pull request #27052 from totten/master-data-nonphp

(REF) civicrm_data.tpl - Stop using Smarty's {php}

2 years agoMerge pull request #27055 from totten/nfc-eventtest
Eileen McNaughton [Sat, 12 Aug 2023 01:44:20 +0000 (13:44 +1200)]
Merge pull request #27055 from totten/nfc-eventtest

(NFC) Test class - Fix inconsistent namespace

2 years agoMerge pull request #27032 from eileenmcnaughton/dep
Tim Otten [Sat, 12 Aug 2023 00:47:17 +0000 (17:47 -0700)]
Merge pull request #27032 from eileenmcnaughton/dep

Unit tests - replace deprecated function with newer one