civicrm-core.git
11 months agoMerge pull request #28740 from colemanw/searchKitDisplayPresentation
colemanw [Thu, 21 Dec 2023 20:27:00 +0000 (15:27 -0500)]
Merge pull request #28740 from colemanw/searchKitDisplayPresentation

dev/user-interface#49 - Improve SearchKit admin display presentation

11 months agoMerge pull request #28273 from bb/master
demeritcowboy [Thu, 21 Dec 2023 20:17:07 +0000 (15:17 -0500)]
Merge pull request #28273 from bb/master

Add weasyprint pdf generation as alternative to wkhtmltopdf

11 months agoMerge pull request #28754 from braders/feature/php8-advanced-search
Eileen McNaughton [Thu, 21 Dec 2023 19:15:33 +0000 (08:15 +1300)]
Merge pull request #28754 from braders/feature/php8-advanced-search

[REF][PHP8.2] Declare properties in advanced search form

11 months agoMerge pull request #28723 from totten/master-strict-hook
Tim Otten [Thu, 21 Dec 2023 18:54:35 +0000 (10:54 -0800)]
Merge pull request #28723 from totten/master-strict-hook

tests/events/*.php - Allow optional runtime enforcement

11 months agoMerge pull request #27685 from eileenmcnaughton/ev_tokens
colemanw [Thu, 21 Dec 2023 18:42:45 +0000 (13:42 -0500)]
Merge pull request #27685 from eileenmcnaughton/ev_tokens

Standardise some more event template tokens

11 months agoMerge pull request #28756 from braders/mailing-page-local-var
colemanw [Thu, 21 Dec 2023 18:37:50 +0000 (13:37 -0500)]
Merge pull request #28756 from braders/mailing-page-local-var

[REF][PHP8.2] Replace dynamic property with local var - mailing browse page

11 months ago[REF][PHP8.2] Replace dynamic property with local var - mailing browse
Bradley Taylor [Thu, 21 Dec 2023 17:48:07 +0000 (17:48 +0000)]
[REF][PHP8.2] Replace dynamic property with local var - mailing browse

11 months ago[REF][PHP8.2] Declare properties in advanced search form
Bradley Taylor [Thu, 21 Dec 2023 14:12:53 +0000 (14:12 +0000)]
[REF][PHP8.2] Declare properties in advanced search form

11 months agoMerge pull request #28751 from demeritcowboy/regen81
Eileen McNaughton [Thu, 21 Dec 2023 08:02:39 +0000 (21:02 +1300)]
Merge pull request #28751 from demeritcowboy/regen81

Update regen online script to use php 8.1 since this doesn't have polyfills available and now str_contains makes it fail

11 months agoMerge pull request #28752 from demeritcowboy/regen
Eileen McNaughton [Thu, 21 Dec 2023 06:51:50 +0000 (19:51 +1300)]
Merge pull request #28752 from demeritcowboy/regen

regen after 28704

11 months agoregen
demeritcowboy [Thu, 21 Dec 2023 06:07:17 +0000 (01:07 -0500)]
regen

11 months agoupdate php since this doesn't have polyfills available and now str_contains makes...
demeritcowboy [Thu, 21 Dec 2023 05:55:47 +0000 (00:55 -0500)]
update php since this doesn't have polyfills available and now str_contains makes it fail

11 months agoMerge pull request #28749 from demeritcowboy/packages-smarty3
demeritcowboy [Thu, 21 Dec 2023 05:47:14 +0000 (00:47 -0500)]
Merge pull request #28749 from demeritcowboy/packages-smarty3

Alternate to alternate packages path for smarty3

11 months agoMerge pull request #28704 from eileenmcnaughton/no_test
demeritcowboy [Thu, 21 Dec 2023 05:45:54 +0000 (00:45 -0500)]
Merge pull request #28704 from eileenmcnaughton/no_test

Remove some more text template versions

11 months agotemporary fix
demeritcowboy [Thu, 21 Dec 2023 04:46:07 +0000 (23:46 -0500)]
temporary fix

11 months agoMerge pull request #28747 from civicrm/5.69
colemanw [Thu, 21 Dec 2023 01:24:28 +0000 (20:24 -0500)]
Merge pull request #28747 from civicrm/5.69

Merge 5.69 to master

11 months agoMerge pull request #28746 from eileenmcnaughton/retreive
colemanw [Thu, 21 Dec 2023 01:09:06 +0000 (20:09 -0500)]
Merge pull request #28746 from eileenmcnaughton/retreive

Fix admin forms to not call deprecated functions

11 months agoFix admin forms to not call deprecated functions
Eileen McNaughton [Wed, 20 Dec 2023 23:42:55 +0000 (12:42 +1300)]
Fix admin forms to not call deprecated functions

11 months agoMerge pull request #28737 from colemanw/isDeletedRel
Aidan Saunders [Wed, 20 Dec 2023 23:38:01 +0000 (23:38 +0000)]
Merge pull request #28737 from colemanw/isDeletedRel

ContactSummary - Exclude deleted contacts from relationship tab

11 months agoMerge pull request #28743 from eileenmcnaughton/acl_fix
Seamus Lee [Wed, 20 Dec 2023 23:14:35 +0000 (10:14 +1100)]
Merge pull request #28743 from eileenmcnaughton/acl_fix

Fix acls in demo data

11 months agoMerge pull request #28741 from colemanw/contactTypeFix
colemanw [Wed, 20 Dec 2023 22:52:00 +0000 (17:52 -0500)]
Merge pull request #28741 from colemanw/contactTypeFix

dev/core#4872 - Fix APIv4 error when searching contacts with GROUP BY

11 months agoFix acls
Eileen McNaughton [Wed, 20 Dec 2023 22:34:58 +0000 (11:34 +1300)]
Fix acls

11 months agoMerge pull request #28736 from demeritcowboy/check
colemanw [Wed, 20 Dec 2023 21:53:04 +0000 (16:53 -0500)]
Merge pull request #28736 from demeritcowboy/check

False positive in status check

11 months agodev/core#4872 - Fix APIv4 error when searching contacts with GROUP BY
colemanw [Wed, 20 Dec 2023 21:36:59 +0000 (16:36 -0500)]
dev/core#4872 - Fix APIv4 error when searching contacts with GROUP BY

11 months agoSearchKit - Collapse admin display settings in details
colemanw [Wed, 20 Dec 2023 21:16:00 +0000 (16:16 -0500)]
SearchKit - Collapse admin display settings in details

11 months agoSearchKit - Improve layout of admin displays
colemanw [Wed, 20 Dec 2023 21:03:18 +0000 (16:03 -0500)]
SearchKit - Improve layout of admin displays

Collapse columns to save space.
Split addColMenu in two, allows toggling multiple columns at once.

11 months agoContactSummary - Exclude deleted contacts from relationship tab
colemanw [Wed, 20 Dec 2023 19:14:10 +0000 (14:14 -0500)]
ContactSummary - Exclude deleted contacts from relationship tab

11 months agonot deleted
demeritcowboy [Wed, 20 Dec 2023 18:37:28 +0000 (13:37 -0500)]
not deleted

11 months agoMerge pull request #28721 from michaelmcandrew/searchKitEntityRefJoins
colemanw [Wed, 20 Dec 2023 16:19:47 +0000 (11:19 -0500)]
Merge pull request #28721 from michaelmcandrew/searchKitEntityRefJoins

Allow searchkit joins via EntityRef fields in multivalue custom data

11 months agoSome minor readability improvements
Michael McAndrew [Wed, 20 Dec 2023 14:58:03 +0000 (15:58 +0100)]
Some minor readability improvements

11 months agoSearchKit - Consolidate getJoins, add tests
colemanw [Wed, 20 Dec 2023 03:22:06 +0000 (22:22 -0500)]
SearchKit - Consolidate getJoins, add tests

11 months agoMerge pull request #28734 from lemniscus/php-warning-null-as-array
Eileen McNaughton [Wed, 20 Dec 2023 07:33:58 +0000 (20:33 +1300)]
Merge pull request #28734 from lemniscus/php-warning-null-as-array

Fix PHP warning: trying to use null as array

11 months agoFix PHP warning: trying to use null as array
Noah Miller [Wed, 20 Dec 2023 06:14:47 +0000 (22:14 -0800)]
Fix PHP warning: trying to use null as array

11 months agoMerge pull request #28731 from eileenmcnaughton/amount_conf
Eileen McNaughton [Wed, 20 Dec 2023 05:59:36 +0000 (18:59 +1300)]
Merge pull request #28731 from eileenmcnaughton/amount_conf

Extract chunk of code to function

11 months agoMerge pull request #28728 from eileenmcnaughton/pcp
colemanw [Wed, 20 Dec 2023 03:40:20 +0000 (22:40 -0500)]
Merge pull request #28728 from eileenmcnaughton/pcp

Fix notice, undefined property on Pcp page

11 months agoMerge pull request #28725 from eileenmcnaughton/smarty
colemanw [Wed, 20 Dec 2023 03:39:18 +0000 (22:39 -0500)]
Merge pull request #28725 from eileenmcnaughton/smarty

Enable Smarty3, smarty notices  by default for all localhost or demo builds

11 months agoMerge pull request #28729 from eileenmcnaughton/page_dep
Eileen McNaughton [Wed, 20 Dec 2023 03:25:16 +0000 (16:25 +1300)]
Merge pull request #28729 from eileenmcnaughton/page_dep

Deprecate less reliable contributionPage api functions

11 months agoExtract chunk of code to function
Eileen McNaughton [Wed, 20 Dec 2023 03:13:51 +0000 (16:13 +1300)]
Extract chunk of code to function

11 months agoFix notice, undefined property on Pcp page
Eileen McNaughton [Wed, 20 Dec 2023 02:08:43 +0000 (15:08 +1300)]
Fix notice, undefined property on Pcp page

11 months agoDeprecate less reliable contributionPage api functions
Eileen McNaughton [Wed, 20 Dec 2023 02:22:55 +0000 (15:22 +1300)]
Deprecate less reliable contributionPage api functions

These functions only really got adopted in tests - we should discourage people from
using them as I think they somewhat unreliable

11 months agoEnable Smarty3, smarty notices by default for all localhost or demo builds
Eileen McNaughton [Wed, 20 Dec 2023 00:17:17 +0000 (13:17 +1300)]
Enable Smarty3, smarty notices  by default for all localhost or demo builds

11 months agohook_civicrm_links.evch.php - Ignore miscreant `create.new.shortcuts`
Tim Otten [Tue, 19 Dec 2023 22:19:12 +0000 (14:19 -0800)]
hook_civicrm_links.evch.php - Ignore miscreant `create.new.shortcuts`

This variant of hook_civicrm_links has multiple compliance issues.  It
raises so many red-flags that it makes the site unbrowseable and obscures
any useful signal about the other hooks. Skip it until someone
can take a full look.

11 months agoevent_check - If enabled, then constantly enforce event contracts
Tim Otten [Tue, 19 Dec 2023 22:11:05 +0000 (14:11 -0800)]
event_check - If enabled, then constantly enforce event contracts

11 months agoevent_check - Add skeletal extension
Tim Otten [Tue, 19 Dec 2023 21:41:41 +0000 (13:41 -0800)]
event_check - Add skeletal extension

11 months agoEventCheck - Drop dependency on PHPUnit
Tim Otten [Tue, 19 Dec 2023 20:33:20 +0000 (12:33 -0800)]
EventCheck - Drop dependency on PHPUnit

11 months agoMerge pull request #28708 from twomice/4813_CRM_Report_Form_Activity
Eileen McNaughton [Tue, 19 Dec 2023 23:08:17 +0000 (12:08 +1300)]
Merge pull request #28708 from twomice/4813_CRM_Report_Form_Activity

WIP: Fix dev/core#4813: CRM_Report_Form_Activity: Add Employer fields, and…

11 months ago(REF) EventCheck - Drop unused methods `setUp()`, `tearDown()`
Tim Otten [Tue, 19 Dec 2023 20:11:02 +0000 (12:11 -0800)]
(REF) EventCheck - Drop unused methods `setUp()`, `tearDown()`

11 months ago(REF) EventCheck - Drop unused property `$test`
Tim Otten [Tue, 19 Dec 2023 20:07:48 +0000 (12:07 -0800)]
(REF) EventCheck - Drop unused property `$test`

11 months agoFix dev/core#4813: CRM_Report_Form_Activity: Add Employer fields, and "contact"-based...
Allen Shaw [Mon, 4 Dec 2023 18:35:45 +0000 (12:35 -0600)]
Fix dev/core#4813: CRM_Report_Form_Activity: Add Employer fields, and "contact"-based custom fields:

11 months agoAllow joins via EntityRef fields in multivalue custom data
Michael McAndrew [Tue, 19 Dec 2023 16:03:32 +0000 (17:03 +0100)]
Allow joins via EntityRef fields in multivalue custom data

11 months agoMerge pull request #28688 from colemanw/searchKitTabs
Aidan Saunders [Tue, 19 Dec 2023 12:46:50 +0000 (12:46 +0000)]
Merge pull request #28688 from colemanw/searchKitTabs

dev/user-interface#49  - SearchKit: improve tabbed interface

11 months agoMerge pull request #28719 from mattwire/revert
Matthew Wire [Tue, 19 Dec 2023 11:24:54 +0000 (11:24 +0000)]
Merge pull request #28719 from mattwire/revert

Revert changes that I strongly oppose that were forced through whilst I was asleep

11 months agoRevert "Fix regression on frequency unit handling in 5.69"
Matthew Wire [Tue, 19 Dec 2023 11:19:54 +0000 (11:19 +0000)]
Revert "Fix regression on frequency unit handling in 5.69"

This reverts commit e62b3a8f51e8396f5658313954cc1884567bce6b.

11 months agoRevert "Add test cover for Dummy deprecations"
Matthew Wire [Tue, 19 Dec 2023 11:19:39 +0000 (11:19 +0000)]
Revert "Add test cover for Dummy deprecations"

This reverts commit e2d37012ddd8f131a1b1c57366d805ff45b3d6da.

11 months agoMerge pull request #28537 from greenpeace-cee/standalone-session-management
Rich Lott [Tue, 19 Dec 2023 11:11:04 +0000 (11:11 +0000)]
Merge pull request #28537 from greenpeace-cee/standalone-session-management

Standalone session management

11 months agoMerge pull request #28714 from eileenmcnaughton/notice_m
Matthew Wire [Tue, 19 Dec 2023 11:03:58 +0000 (11:03 +0000)]
Merge pull request #28714 from eileenmcnaughton/notice_m

Fix notice on rendering examples when no contribution pages exist

11 months agoRemove navigation reset
mflandorfer [Tue, 19 Dec 2023 09:37:08 +0000 (10:37 +0100)]
Remove navigation reset

Co-authored-by: Rich Lott <artfulrobot@users.noreply.github.com>
11 months agoChange Weasyprint to use css page styles
Benjamin Bock [Mon, 18 Dec 2023 16:49:39 +0000 (17:49 +0100)]
Change Weasyprint to use css page styles

11 months agoRequire weasyprint with composer
Benjamin Bock [Sun, 17 Dec 2023 14:04:32 +0000 (15:04 +0100)]
Require weasyprint with composer

11 months agoAdd contributor
Benjamin Bock [Thu, 23 Nov 2023 22:14:04 +0000 (23:14 +0100)]
Add contributor

11 months agoChange setting name to new settings style
Benjamin Bock [Thu, 23 Nov 2023 20:44:43 +0000 (21:44 +0100)]
Change setting name to new settings style

11 months agoConvert PDF Utils to new config syntax
Benjamin Bock [Thu, 23 Nov 2023 20:36:34 +0000 (21:36 +0100)]
Convert PDF Utils to new config syntax

Partially revert f144ac104a

11 months agoHarmonize writing PDFs without apostrophe
Benjamin Bock [Thu, 23 Nov 2023 15:42:31 +0000 (16:42 +0100)]
Harmonize writing PDFs without apostrophe

Co-authored-by: William Mortada <williammortada@thirdsectordesign.org>
11 months agoAdd weasyprint pdf generation as alternative to wkhtmltopdf
Benjamin Bock [Thu, 23 Nov 2023 00:01:27 +0000 (01:01 +0100)]
Add weasyprint pdf generation as alternative to wkhtmltopdf

11 months agoMerge pull request #28717 from eileenmcnaughton/master
Eileen McNaughton [Tue, 19 Dec 2023 07:27:23 +0000 (20:27 +1300)]
Merge pull request #28717 from eileenmcnaughton/master

5.69 to master

11 months agoMerge branch '5.69' of github.com:civicrm/civicrm-core
Eileen McNaughton [Tue, 19 Dec 2023 05:21:42 +0000 (18:21 +1300)]
Merge branch '5.69' of github.com:civicrm/civicrm-core

11 months agoMerge pull request #28694 from eileenmcnaughton/fix_frequency_2_months
Tim Otten [Tue, 19 Dec 2023 05:19:00 +0000 (21:19 -0800)]
Merge pull request #28694 from eileenmcnaughton/fix_frequency_2_months

Fix Recur frequency on auto-renew memberships

11 months agoMerge pull request #28695 from eileenmcnaughton/notice_thank
Tim Otten [Tue, 19 Dec 2023 04:34:30 +0000 (20:34 -0800)]
Merge pull request #28695 from eileenmcnaughton/notice_thank

Fix some notices on the Contribution ThankYou page

11 months agoFix error on recurring membership in the rc
Eileen McNaughton [Mon, 18 Dec 2023 11:01:40 +0000 (00:01 +1300)]
Fix error on recurring membership in the rc

Extend recur membership frequency test + fix to bi-monthly payments

11 months agoMerge pull request #28715 from demeritcowboy/regen
Eileen McNaughton [Tue, 19 Dec 2023 03:57:17 +0000 (16:57 +1300)]
Merge pull request #28715 from demeritcowboy/regen

regen after 28705

11 months agoMerge pull request #28709 from totten/5.69-ical
Tim Otten [Tue, 19 Dec 2023 03:39:11 +0000 (19:39 -0800)]
Merge pull request #28709 from totten/5.69-ical

CiviEvent - Fix iCalendar regression (RC)

11 months agoMerge pull request #28713 from eileenmcnaughton/dummy
Tim Otten [Tue, 19 Dec 2023 03:23:12 +0000 (19:23 -0800)]
Merge pull request #28713 from eileenmcnaughton/dummy

Add test cover for Dummy warnings

11 months agoregen
demeritcowboy [Tue, 19 Dec 2023 02:53:38 +0000 (21:53 -0500)]
regen

11 months agoMerge pull request #28705 from eileenmcnaughton/template_cancel
demeritcowboy [Tue, 19 Dec 2023 02:48:18 +0000 (21:48 -0500)]
Merge pull request #28705 from eileenmcnaughton/template_cancel

Fix notice in participant_cancelled email

11 months agoFix notice on rendering examples when no contribution pages exist
Eileen McNaughton [Tue, 19 Dec 2023 02:23:38 +0000 (15:23 +1300)]
Fix notice on rendering examples when no contribution pages exist

11 months agoAdd test cover for Dummy deprecations
Eileen McNaughton [Tue, 19 Dec 2023 01:47:55 +0000 (14:47 +1300)]
Add test cover for Dummy deprecations

11 months agoFix regression on frequency unit handling in 5.69
Eileen McNaughton [Sun, 17 Dec 2023 21:38:00 +0000 (10:38 +1300)]
Fix regression on frequency unit handling in 5.69

11 months agoMerge pull request #28710 from mattwire/deprecatedinvoicesettings
Eileen McNaughton [Tue, 19 Dec 2023 00:57:35 +0000 (13:57 +1300)]
Merge pull request #28710 from mattwire/deprecatedinvoicesettings

Replace deprecated invoice settings

11 months agoFix notice in participant_cancelled email
Eileen McNaughton [Mon, 18 Dec 2023 21:08:59 +0000 (10:08 +1300)]
Fix notice in participant_cancelled email

11 months agoCiviEvent - Re-fix iCal. Preserve compatibility.
Tim Otten [Tue, 19 Dec 2023 00:44:16 +0000 (16:44 -0800)]
CiviEvent - Re-fix iCal. Preserve compatibility.

The recently merged commit for `CRM_Utils_ICalendar` fixed one bug and did
some code-cleanup...  but it changed a contract in a way that breaks
`eventics` extension.

This restores the original contract and a more conservative fix.

11 months agoMerge pull request #28707 from colemanw/reportInstanceCleanup
Eileen McNaughton [Tue, 19 Dec 2023 00:12:10 +0000 (13:12 +1300)]
Merge pull request #28707 from colemanw/reportInstanceCleanup

ReportInstance - Cleanup BAO::add function and DAO metadata

11 months agoReplace deprecated invoice settings
Matthew Wire [Tue, 19 Dec 2023 00:03:35 +0000 (00:03 +0000)]
Replace deprecated invoice settings

11 months agoFix Event iCalendar regression
Jon Goldberg [Mon, 18 Dec 2023 16:16:04 +0000 (11:16 -0500)]
Fix Event iCalendar regression

11 months agoMerge pull request #28701 from eileenmcnaughton/get
Seamus Lee [Mon, 18 Dec 2023 22:51:28 +0000 (09:51 +1100)]
Merge pull request #28701 from eileenmcnaughton/get

[php8.x] Remove unused undeclared property `_params`, provide __get for transitional support

11 months agoSearchKit - Update tab styling
colemanw [Mon, 18 Dec 2023 18:52:58 +0000 (13:52 -0500)]
SearchKit - Update tab styling

11 months agoReportInstance - Cleanup BAO::add function and DAO metadata
colemanw [Mon, 18 Dec 2023 21:59:27 +0000 (16:59 -0500)]
ReportInstance - Cleanup BAO::add function and DAO metadata

11 months agoMerge pull request #28706 from civicrm/revert-28703-declarations
Eileen McNaughton [Mon, 18 Dec 2023 21:16:22 +0000 (10:16 +1300)]
Merge pull request #28706 from civicrm/revert-28703-declarations

Revert "Remove parent-declared properties"

11 months agoRevert "Remove parent-declared properties"
Eileen McNaughton [Mon, 18 Dec 2023 21:15:48 +0000 (10:15 +1300)]
Revert "Remove parent-declared properties"

11 months agoRemove some more text template versions
Eileen McNaughton [Mon, 18 Dec 2023 19:51:00 +0000 (08:51 +1300)]
Remove some more text template versions

As already done for membership_online receipt etc

11 months agoMerge pull request #28653 from colemanw/deletedFiles
Tim Otten [Mon, 18 Dec 2023 20:35:57 +0000 (12:35 -0800)]
Merge pull request #28653 from colemanw/deletedFiles

dev/core#2607 - Maintain list of deleted files

11 months agoPass value as variable, not property
Eileen McNaughton [Mon, 18 Dec 2023 20:29:08 +0000 (09:29 +1300)]
Pass value as variable, not property

11 months agoMerge pull request #28703 from eileenmcnaughton/declarations
Eileen McNaughton [Mon, 18 Dec 2023 20:28:24 +0000 (09:28 +1300)]
Merge pull request #28703 from eileenmcnaughton/declarations

Remove parent-declared properties

11 months agoRemove parent-declared properties
Eileen McNaughton [Mon, 18 Dec 2023 19:37:23 +0000 (08:37 +1300)]
Remove parent-declared properties

11 months agoMerge pull request #28697 from eileenmcnaughton/ignore
Eileen McNaughton [Mon, 18 Dec 2023 19:32:11 +0000 (08:32 +1300)]
Merge pull request #28697 from eileenmcnaughton/ignore

Stop ignoring tests when apiv4 function does not exist

11 months agoSearchKit - add/fix role & aria properties for main tabs
colemanw [Mon, 18 Dec 2023 17:03:14 +0000 (12:03 -0500)]
SearchKit - add/fix role & aria properties for main tabs

11 months agoRemove unused undeclared property _params, provide __get for transitional support
Eileen McNaughton [Mon, 18 Dec 2023 19:06:49 +0000 (08:06 +1300)]
Remove unused undeclared property _params, provide __get for transitional support

11 months agoMerge pull request #28666 from colemanw/daoCleanup
Eileen McNaughton [Mon, 18 Dec 2023 19:03:10 +0000 (08:03 +1300)]
Merge pull request #28666 from colemanw/daoCleanup

DAO - Remove fieldKeys(), getLog() and getTableName()

11 months agoStop ignoring tests when apiv4 function does not exist
Eileen McNaughton [Mon, 18 Dec 2023 12:50:08 +0000 (01:50 +1300)]
Stop ignoring tests when apiv4 function does not exist

11 months agoMerge pull request #28698 from civicrm/5.69
demeritcowboy [Mon, 18 Dec 2023 16:01:25 +0000 (11:01 -0500)]
Merge pull request #28698 from civicrm/5.69

5.69

11 months agoMerge pull request #28696 from eileenmcnaughton/notice_processor
demeritcowboy [Mon, 18 Dec 2023 14:52:53 +0000 (09:52 -0500)]
Merge pull request #28696 from eileenmcnaughton/notice_processor

Address payment processor notice in thankyou.tpl