civicrm-core.git
11 months agoMerge pull request #28685 from civicrm/5.69
Eileen McNaughton [Sun, 17 Dec 2023 23:25:02 +0000 (12:25 +1300)]
Merge pull request #28685 from civicrm/5.69

5.69

11 months agoMerge pull request #28294 from eileenmcnaughton/currency_notice
Seamus Lee [Sun, 17 Dec 2023 22:30:25 +0000 (09:30 +1100)]
Merge pull request #28294 from eileenmcnaughton/currency_notice

Fix tax on other_amount, treat as inclusive of tax

11 months agoMerge pull request #28682 from eileenmcnaughton/build_form
Eileen McNaughton [Sun, 17 Dec 2023 22:14:54 +0000 (11:14 +1300)]
Merge pull request #28682 from eileenmcnaughton/build_form

Set formBuilt to TRUE when, erm, it is built

11 months agoMerge pull request #28679 from eileenmcnaughton/no_fee_block
Eileen McNaughton [Sun, 17 Dec 2023 21:40:24 +0000 (10:40 +1300)]
Merge pull request #28679 from eileenmcnaughton/no_fee_block

Replace undeclared property with local variable

11 months agoMerge pull request #28683 from civicrm/5.69
Eileen McNaughton [Sun, 17 Dec 2023 21:02:13 +0000 (10:02 +1300)]
Merge pull request #28683 from civicrm/5.69

5.69

11 months agoMerge pull request #28658 from eileenmcnaughton/payment
colemanw [Sun, 17 Dec 2023 20:56:40 +0000 (15:56 -0500)]
Merge pull request #28658 from eileenmcnaughton/payment

Fix amount not getting passed through in simple contribution flow

11 months agoMerge pull request #28675 from eileenmcnaughton/tests-
Seamus Lee [Sun, 17 Dec 2023 20:50:47 +0000 (07:50 +1100)]
Merge pull request #28675 from eileenmcnaughton/tests-

Minor variable standardisation in test

11 months agoSet formBuilt to TRUE when, erm, it is built
Eileen McNaughton [Sun, 17 Dec 2023 20:45:11 +0000 (09:45 +1300)]
Set formBuilt to TRUE when, erm, it is built

11 months agoReplace undeclared property with local variable
Eileen McNaughton [Sun, 17 Dec 2023 20:28:15 +0000 (09:28 +1300)]
Replace undeclared property with local variable

11 months agoMinor variable standardisation in test
Eileen McNaughton [Sun, 17 Dec 2023 20:05:54 +0000 (09:05 +1300)]
Minor variable standardisation in test

11 months agoMerge pull request #28464 from seamuslee001/line_item_crm_type
Eileen McNaughton [Sun, 17 Dec 2023 05:28:56 +0000 (18:28 +1300)]
Merge pull request #28464 from seamuslee001/line_item_crm_type

[REF] Change LineItem.qty to be CRM type of FLOAT rather than Money a…

11 months agoMerge pull request #28671 from eileenmcnaughton/test_cleanup_fix
Seamus Lee [Sat, 16 Dec 2023 23:56:49 +0000 (10:56 +1100)]
Merge pull request #28671 from eileenmcnaughton/test_cleanup_fix

Cleanup membership Types in test

11 months agoCleanup membership Types
Eileen McNaughton [Sat, 16 Dec 2023 22:22:36 +0000 (11:22 +1300)]
Cleanup membership Types

11 months agoFix tests to test-template-data-update
Eileen McNaughton [Sat, 16 Dec 2023 21:33:47 +0000 (10:33 +1300)]
Fix tests to test-template-data-update

11 months agoMerge pull request #28669 from demeritcowboy/context-php8
Eileen McNaughton [Sat, 16 Dec 2023 21:34:44 +0000 (10:34 +1300)]
Merge pull request #28669 from demeritcowboy/context-php8

[PHP8] Remove unneeded $this->_context in Case_Page_Tab

11 months agodoes nothing
demeritcowboy [Sat, 16 Dec 2023 20:01:08 +0000 (15:01 -0500)]
does nothing

11 months agoMerge pull request #28667 from civicrm/5.69
demeritcowboy [Sat, 16 Dec 2023 13:46:10 +0000 (08:46 -0500)]
Merge pull request #28667 from civicrm/5.69

5.69

11 months agoMerge pull request #28665 from vingle/patch-19
demeritcowboy [Sat, 16 Dec 2023 01:38:46 +0000 (20:38 -0500)]
Merge pull request #28665 from vingle/patch-19

Fixes two advanced search accordions UX regressions

11 months agoFixes two UX regressions
Nicol [Sat, 16 Dec 2023 00:18:49 +0000 (00:18 +0000)]
Fixes two UX regressions

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

11 months agoMerge pull request #28664 from demeritcowboy/regen
Seamus Lee [Fri, 15 Dec 2023 23:44:09 +0000 (10:44 +1100)]
Merge pull request #28664 from demeritcowboy/regen

regen after 28633

11 months agoMerge pull request #28663 from civicrm/5.69
demeritcowboy [Fri, 15 Dec 2023 23:09:40 +0000 (18:09 -0500)]
Merge pull request #28663 from civicrm/5.69

5.69

11 months agoregen
demeritcowboy [Fri, 15 Dec 2023 23:03:02 +0000 (18:03 -0500)]
regen

11 months agoMerge pull request #28633 from eileenmcnaughton/no_text_
demeritcowboy [Fri, 15 Dec 2023 22:57:44 +0000 (17:57 -0500)]
Merge pull request #28633 from eileenmcnaughton/no_text_

Remove the text versions of a few more template

11 months agoMerge pull request #28661 from vingle/patch-15
demeritcowboy [Fri, 15 Dec 2023 22:36:48 +0000 (17:36 -0500)]
Merge pull request #28661 from vingle/patch-15

Advanced search UX regression - collapses search criteria when there's results

11 months agoMerge pull request #28442 from colemanw/metadataFlush
colemanw [Fri, 15 Dec 2023 21:50:55 +0000 (16:50 -0500)]
Merge pull request #28442 from colemanw/metadataFlush

Metadata - Refresh clientside resources when clearing cache

11 months agoCache - Use service name
colemanw [Sun, 3 Dec 2023 16:20:07 +0000 (16:20 +0000)]
Cache - Use service name

11 months agoUpdate templates/CRM/Contact/Form/Search/Advanced.tpl
Nicol [Fri, 15 Dec 2023 17:21:01 +0000 (17:21 +0000)]
Update templates/CRM/Contact/Form/Search/Advanced.tpl

Simpler syntax

Co-authored-by: colemanw <coleman@civicrm.org>
11 months agoAdvanced search UX regression - collapses search criteria when there's results
Nicol [Fri, 15 Dec 2023 16:26:33 +0000 (16:26 +0000)]
Advanced search UX regression - collapses search criteria when there's results

Old UX of collapsing search criteria when there's results was lost during recent markup changes. This restores that.

11 months agoMerge pull request #28523 from jaapjansma/role_permission_ui
Rich Lott [Fri, 15 Dec 2023 11:31:33 +0000 (11:31 +0000)]
Merge pull request #28523 from jaapjansma/role_permission_ui

dev/core#4835 Standalone Permissions user interface

11 months agoMerge pull request #28654 from eileenmcnaughton/build_back
Matthew Wire [Fri, 15 Dec 2023 10:08:59 +0000 (10:08 +0000)]
Merge pull request #28654 from eileenmcnaughton/build_back

Remove front-end-only optionFullIds handling from back office form

11 months agoMerge pull request #28651 from eileenmcnaughton/update
Matthew Wire [Fri, 15 Dec 2023 10:08:03 +0000 (10:08 +0000)]
Merge pull request #28651 from eileenmcnaughton/update

Update updateSubscriptionTest to use`FormTestTrait`

11 months agoMerge pull request #28476 from AlainBenbassat/searchkit_manage_events
Seamus Lee [Fri, 15 Dec 2023 06:16:58 +0000 (17:16 +1100)]
Merge pull request #28476 from AlainBenbassat/searchkit_manage_events

adds Manage Events

11 months agoMerge pull request #28466 from artfulrobot/artfulrobot-ang-href-attr
Seamus Lee [Fri, 15 Dec 2023 06:16:21 +0000 (17:16 +1100)]
Merge pull request #28466 from artfulrobot/artfulrobot-ang-href-attr

Fix missing blank href attr on <a> links in searchkit angular

11 months agoMerge pull request #28660 from colemanw/relationshipCacheStatusCheck
Seamus Lee [Fri, 15 Dec 2023 06:15:46 +0000 (17:15 +1100)]
Merge pull request #28660 from colemanw/relationshipCacheStatusCheck

RelationshipCache - Add status check to ensure cache table is up-to-date

11 months ago[REF] Change LineItem.qty to be CRM type of FLOAT rather than Money as this field...
Seamus Lee [Mon, 4 Dec 2023 05:04:31 +0000 (16:04 +1100)]
[REF] Change LineItem.qty to be CRM type of FLOAT rather than Money as this field needs decimals but not to have $ added

11 months agoRelationshipCache - Add status check to ensure cache table is up-to-date
colemanw [Fri, 15 Dec 2023 01:47:58 +0000 (20:47 -0500)]
RelationshipCache - Add status check to ensure cache table is up-to-date

11 months agoMerge pull request #28656 from eileenmcnaughton/update_3
Seamus Lee [Thu, 14 Dec 2023 23:03:33 +0000 (10:03 +1100)]
Merge pull request #28656 from eileenmcnaughton/update_3

Add standardised form get traits

11 months agoMerge pull request #28657 from eileenmcnaughton/part_formy
colemanw [Thu, 14 Dec 2023 22:20:21 +0000 (17:20 -0500)]
Merge pull request #28657 from eileenmcnaughton/part_formy

Unshare init event fee

11 months agoAdd check for mis-formatted amount
Eileen McNaughton [Thu, 14 Dec 2023 20:56:04 +0000 (09:56 +1300)]
Add check for mis-formatted amount

11 months agofix comment
Eileen McNaughton [Thu, 14 Dec 2023 21:55:09 +0000 (10:55 +1300)]
fix comment

11 months agoFix amount not getting passed through in simple contribution flow
Eileen McNaughton [Thu, 14 Dec 2023 20:34:04 +0000 (09:34 +1300)]
Fix amount not getting passed through in simple contribution flow

11 months agoUnshare init event fee
Eileen McNaughton [Thu, 14 Dec 2023 19:59:07 +0000 (08:59 +1300)]
Unshare init event fee

11 months agoMerge pull request #28649 from eileenmcnaughton/remove
colemanw [Thu, 14 Dec 2023 19:40:08 +0000 (14:40 -0500)]
Merge pull request #28649 from eileenmcnaughton/remove

Remove extraneous call to check financial acl

11 months agoAdd standardised for get traits
Eileen McNaughton [Thu, 14 Dec 2023 19:28:33 +0000 (08:28 +1300)]
Add standardised for get traits

11 months agoMerge pull request #28655 from civicrm/5.69
Eileen McNaughton [Thu, 14 Dec 2023 19:23:17 +0000 (08:23 +1300)]
Merge pull request #28655 from civicrm/5.69

5.69 to master

11 months agoRemove front-end-only optionFullIds variable
Eileen McNaughton [Thu, 14 Dec 2023 05:24:46 +0000 (18:24 +1300)]
Remove front-end-only optionFullIds variable

11 months agoMerge pull request #28445 from colemanw/superAdmin
Tim Otten [Thu, 14 Dec 2023 17:43:44 +0000 (09:43 -0800)]
Merge pull request #28445 from colemanw/superAdmin

APIv4 - Super-admins don't always have access to everything

11 months agoMerge pull request #28588 from mlutfy/checklist
Matthew Wire [Thu, 14 Dec 2023 12:15:48 +0000 (12:15 +0000)]
Merge pull request #28588 from mlutfy/checklist

ConfigTaskList: a few language tweaks and add reference to CiviCRM themes

11 months agoMerge pull request #28646 from eileenmcnaughton/build_back
Matthew Wire [Thu, 14 Dec 2023 12:09:05 +0000 (12:09 +0000)]
Merge pull request #28646 from eileenmcnaughton/build_back

Unshare `buildAmount` block functions from front_end form

11 months agoMerge pull request #28648 from eileenmcnaughton/notice_tasks
Matthew Wire [Thu, 14 Dec 2023 12:08:21 +0000 (12:08 +0000)]
Merge pull request #28648 from eileenmcnaughton/notice_tasks

Fix notices on tasks for less permissioned user

11 months agoMerge pull request #28645 from eileenmcnaughton/params
Matthew Wire [Thu, 14 Dec 2023 12:07:58 +0000 (12:07 +0000)]
Merge pull request #28645 from eileenmcnaughton/params

[php8.x] Fully remove interaction with `_params` from backoffice participant form

11 months agoMerge pull request #28640 from eileenmcnaughton/tax
Matthew Wire [Thu, 14 Dec 2023 12:07:26 +0000 (12:07 +0000)]
Merge pull request #28640 from eileenmcnaughton/tax

Use local array for tax_amount

11 months agoMerge pull request #28650 from eileenmcnaughton/regress
Matthew Wire [Thu, 14 Dec 2023 12:06:45 +0000 (12:06 +0000)]
Merge pull request #28650 from eileenmcnaughton/regress

Fix rc-only regression where submitting back office contribution with a price set selected fatals

11 months agoUpdate updateSubscriptionTest to use FormTestTrait
Eileen McNaughton [Thu, 14 Dec 2023 10:42:08 +0000 (23:42 +1300)]
Update updateSubscriptionTest to use FormTestTrait

11 months agoRemove the text versions of a few more template
Eileen McNaughton [Wed, 13 Dec 2023 01:58:50 +0000 (14:58 +1300)]
Remove the text versions of a few more template

We have done a few of the most common ones. These are all lest common
ones, but could still cause formatting changes in the text version,
requiring a dual to the death with jenkins

11 months agoFully remove interaction with _params from participant form
Eileen McNaughton [Thu, 14 Dec 2023 03:33:51 +0000 (16:33 +1300)]
Fully remove interaction with _params from participant form

This removes the last places _params was accessed & adds a __get for any external access to it

Note this also removes the expiry date from the template. I can't find
the discussion we had about this (maybe on chat) but it was generally agreed that
since we hadn't added a column for this in the DB it made sense to exclude from
the template (as the template should be the same however it is sent).
There was some difference of opinion about whether it should have
stored in the DB though

11 months agoFix regression where submitting back office contribution with a price set selected...
Eileen McNaughton [Thu, 14 Dec 2023 09:33:36 +0000 (22:33 +1300)]
Fix regression where submitting back office contribution with a price set selected fatals

11 months agoRemove extraneous call to check financial acl
Eileen McNaughton [Thu, 14 Dec 2023 07:45:30 +0000 (20:45 +1300)]
Remove extraneous call to check financial acl

BuildAmount hook already does this

11 months agoFix notices on tasks for less permissioned user
Eileen McNaughton [Thu, 14 Dec 2023 07:05:51 +0000 (20:05 +1300)]
Fix notices on tasks for less permissioned user

11 months agoRemove front-end-only optionFullIds variable
Eileen McNaughton [Thu, 14 Dec 2023 05:24:46 +0000 (18:24 +1300)]
Remove front-end-only optionFullIds variable

11 months agoRemove code relating to front-end-only allowConfirmation property
Eileen McNaughton [Thu, 14 Dec 2023 05:23:20 +0000 (18:23 +1300)]
Remove code relating to front-end-only allowConfirmation property

11 months agoUnshare buildAmount block functions from front_end form
Eileen McNaughton [Thu, 14 Dec 2023 05:14:29 +0000 (18:14 +1300)]
Unshare buildAmount block functions from front_end form

Sharing these functions complicates rather than simplifies

11 months agoRemove invalid tax_amount setting
Eileen McNaughton [Wed, 13 Dec 2023 20:47:49 +0000 (09:47 +1300)]
Remove invalid tax_amount setting

11 months agoMerge pull request #28644 from seamuslee001/master
Seamus Lee [Thu, 14 Dec 2023 00:47:20 +0000 (11:47 +1100)]
Merge pull request #28644 from seamuslee001/master

5.69

11 months agoMerge branch '5.69'
Seamus Lee [Thu, 14 Dec 2023 00:44:40 +0000 (11:44 +1100)]
Merge branch '5.69'

11 months agoMerge pull request #28643 from seamuslee001/bump_domppdf_svg_lib
Seamus Lee [Thu, 14 Dec 2023 00:43:07 +0000 (11:43 +1100)]
Merge pull request #28643 from seamuslee001/bump_domppdf_svg_lib

Deploy Package updates for DomPDF and PHP SVG Lib

11 months agoMerge pull request #28639 from eileenmcnaughton/order_params
demeritcowboy [Thu, 14 Dec 2023 00:25:39 +0000 (19:25 -0500)]
Merge pull request #28639 from eileenmcnaughton/order_params

Remove unused function variable

11 months agoDeploy Package updates for DomPDF and PHP SVG Lib
Seamus Lee [Thu, 14 Dec 2023 00:10:49 +0000 (11:10 +1100)]
Deploy Package updates for DomPDF and PHP SVG Lib

11 months agoMerge pull request #28589 from braders/php8-contact-page-view-summary
demeritcowboy [Wed, 13 Dec 2023 19:35:04 +0000 (14:35 -0500)]
Merge pull request #28589 from braders/php8-contact-page-view-summary

[REF][PHP8.2] Add PHP8.2 support to CRM_Contact_Page_View_Summary

11 months agoRemove unused function variable
Eileen McNaughton [Wed, 13 Dec 2023 19:32:42 +0000 (08:32 +1300)]
Remove unused function variable

11 months agoMerge pull request #28631 from colemanw/nullCoalescingAssignmentOperator
demeritcowboy [Wed, 13 Dec 2023 19:21:01 +0000 (14:21 -0500)]
Merge pull request #28631 from colemanw/nullCoalescingAssignmentOperator

PHP 7.4 - Simplify expressions with null coalescing assignment operator

11 months agoMerge pull request #28627 from eileenmcnaughton/order_paramms
Matthew Wire [Wed, 13 Dec 2023 19:06:36 +0000 (19:06 +0000)]
Merge pull request #28627 from eileenmcnaughton/order_paramms

Use standard order class to get amounts on backoffice participant form (card flow)

11 months agoMerge pull request #28624 from colemanw/searchKitDefaultLabel
Matthew Wire [Wed, 13 Dec 2023 19:04:30 +0000 (19:04 +0000)]
Merge pull request #28624 from colemanw/searchKitDefaultLabel

dev/user-interface#49 SearchKit default label

11 months agoMerge pull request #28635 from demeritcowboy/bread
colemanw [Wed, 13 Dec 2023 17:44:18 +0000 (12:44 -0500)]
Merge pull request #28635 from demeritcowboy/bread

dev/drupal#133 - Remove bad and unnecessary breadcrumb on Domain Contact info form

11 months agoMerge pull request #28637 from colemanw/fixMailingTest
demeritcowboy [Wed, 13 Dec 2023 17:21:48 +0000 (12:21 -0500)]
Merge pull request #28637 from colemanw/fixMailingTest

MailingSystemTest - Fix string concatenation

11 months agoPHP 7.4 - Simplify expressions with null coalescing assignment operator
colemanw [Wed, 13 Dec 2023 00:54:26 +0000 (19:54 -0500)]
PHP 7.4 - Simplify expressions with null coalescing assignment operator

11 months agoMailingSystemTest - Fix string concatenation
colemanw [Wed, 13 Dec 2023 16:29:56 +0000 (11:29 -0500)]
MailingSystemTest - Fix string concatenation

11 months agoMerge pull request #28620 from artfulrobot/sk-suggested-classes
colemanw [Wed, 13 Dec 2023 13:15:37 +0000 (08:15 -0500)]
Merge pull request #28620 from artfulrobot/sk-suggested-classes

Add classes to searchkit compose screen to facilitate easier theming

11 months agodev/core#4835 Permissions user interface
Jaap Jansma [Wed, 13 Dec 2023 09:45:02 +0000 (10:45 +0100)]
dev/core#4835 Permissions user interface

11 months agoAdd classes to searchkit compose screen to facilitate easier theming
Rich Lott / Artful Robot [Tue, 12 Dec 2023 15:57:18 +0000 (15:57 +0000)]
Add classes to searchkit compose screen to facilitate easier theming

11 months agobad breadcrumb
demeritcowboy [Wed, 13 Dec 2023 04:39:55 +0000 (23:39 -0500)]
bad breadcrumb

11 months agoMerge pull request #28634 from eileenmcnaughton/table_if
Seamus Lee [Wed, 13 Dec 2023 03:18:54 +0000 (14:18 +1100)]
Merge pull request #28634 from eileenmcnaughton/table_if

Handle NULL in table name check

11 months agoHandle NULL in table name check
Eileen McNaughton [Wed, 13 Dec 2023 02:07:35 +0000 (15:07 +1300)]
Handle NULL in table name check

11 months agoMerge pull request #28619 from colemanw/polyfill
Eileen McNaughton [Wed, 13 Dec 2023 01:01:38 +0000 (14:01 +1300)]
Merge pull request #28619 from colemanw/polyfill

PHP - Remove unneeded polyfills for php 7.3 & 7.4

11 months ago[REF][PHP8.2] Add PHP8.2 support to CRM_Contact_Page_View_Summary
Bradley Taylor [Fri, 8 Dec 2023 18:07:00 +0000 (18:07 +0000)]
[REF][PHP8.2] Add PHP8.2 support to CRM_Contact_Page_View_Summary

11 months agoMerge pull request #28629 from civicrm/5.69
demeritcowboy [Tue, 12 Dec 2023 21:42:32 +0000 (16:42 -0500)]
Merge pull request #28629 from civicrm/5.69

5.69

11 months agoMerge pull request #28501 from ufundo/standalone-user-contact
Rich Lott [Tue, 12 Dec 2023 21:16:53 +0000 (21:16 +0000)]
Merge pull request #28501 from ufundo/standalone-user-contact

expose User Contact in standaloneusers UI

11 months agoMerge pull request #28628 from demeritcowboy/libxml
demeritcowboy [Tue, 12 Dec 2023 21:02:51 +0000 (16:02 -0500)]
Merge pull request #28628 from demeritcowboy/libxml

dev/core#4855 - Avoid errors on contact relationships and notes tabs in stricter environments

11 months agoMerge pull request #28611 from eileenmcnaughton/569
demeritcowboy [Tue, 12 Dec 2023 21:02:17 +0000 (16:02 -0500)]
Merge pull request #28611 from eileenmcnaughton/569

Fix notice regression on contact edit

11 months agounit test
demeritcowboy [Tue, 12 Dec 2023 18:43:20 +0000 (13:43 -0500)]
unit test

11 months agoavoid errors in stricter environments
demeritcowboy [Tue, 12 Dec 2023 18:36:52 +0000 (13:36 -0500)]
avoid errors in stricter environments

11 months agoFix notice regression on contact edit
Eileen McNaughton [Mon, 11 Dec 2023 23:36:18 +0000 (12:36 +1300)]
Fix notice regression on contact edit

This notice occurs when the contact has one or more subtypes allocated. Note that the thing
I focussed on while testing was ensuring that it was possible to add a contact sub-type
and save custom field data applicable to that sub-type. I also checked with the subtype
name differing from the label

11 months agoUse standard order class to get amounts on backoffice participant form (card flow)
Eileen McNaughton [Tue, 12 Dec 2023 18:44:43 +0000 (07:44 +1300)]
Use standard order class to get amounts on backoffice participant form (card flow)

11 months agoRestrict user contact link to Individuals
ufundo [Tue, 12 Dec 2023 17:31:23 +0000 (17:31 +0000)]
Restrict user contact link to Individuals

Co-authored-by: colemanw <coleman@civicrm.org>
11 months agoenable quick add new individual
benjamin [Tue, 5 Dec 2023 13:19:58 +0000 (13:19 +0000)]
enable quick add new individual

11 months agorequire contact to be linked to a user
benjamin [Tue, 5 Dec 2023 12:14:24 +0000 (12:14 +0000)]
require contact to be linked to a user

11 months agoexpose User Contact in standaloneusers UI
benjamin [Tue, 5 Dec 2023 12:09:26 +0000 (12:09 +0000)]
expose User Contact in standaloneusers UI

11 months agoMerge pull request #28625 from civicrm/5.69
demeritcowboy [Tue, 12 Dec 2023 18:53:00 +0000 (13:53 -0500)]
Merge pull request #28625 from civicrm/5.69

5.69

11 months agoMerge pull request #28502 from ufundo/standalone-roles-admin-name
colemanw [Tue, 12 Dec 2023 18:42:44 +0000 (13:42 -0500)]
Merge pull request #28502 from ufundo/standalone-roles-admin-name

Standalone - consistent naming for user/role admin forms/searches

11 months agoMerge pull request #28623 from colemanw/contactTypeOrder
Matthew Wire [Tue, 12 Dec 2023 18:31:39 +0000 (18:31 +0000)]
Merge pull request #28623 from colemanw/contactTypeOrder

ContactType - Ensure stable order