civicrm-core.git
12 months agoMerge pull request #28144 from eileenmcnaughton/online_receipt
Seamus Lee [Wed, 15 Nov 2023 22:35:28 +0000 (09:35 +1100)]
Merge pull request #28144 from eileenmcnaughton/online_receipt

Replace math in template with variable, smarty3 support

12 months agoMerge pull request #28140 from eileenmcnaughton/event_text
Seamus Lee [Wed, 15 Nov 2023 22:34:43 +0000 (09:34 +1100)]
Merge pull request #28140 from eileenmcnaughton/event_text

Remove last references to `_contributeMode`

12 months agoMerge pull request #28155 from totten/master-localtasks
Seamus Lee [Wed, 15 Nov 2023 21:25:03 +0000 (08:25 +1100)]
Merge pull request #28155 from totten/master-localtasks

Page Templates - Remove unused `$localTasks` (`localNav.tpl`)

12 months agoMerge pull request #28154 from civicrm/5.68
demeritcowboy [Wed, 15 Nov 2023 21:03:21 +0000 (16:03 -0500)]
Merge pull request #28154 from civicrm/5.68

5.68

12 months agoPage Templates - Remove unused `$localTasks` (`localNav.tpl`)
Tim Otten [Wed, 15 Nov 2023 20:19:38 +0000 (12:19 -0800)]
Page Templates - Remove unused `$localTasks` (`localNav.tpl`)

12 months agoMerge pull request #28153 from demeritcowboy/menu-missing
Seamus Lee [Wed, 15 Nov 2023 20:10:59 +0000 (07:10 +1100)]
Merge pull request #28153 from demeritcowboy/menu-missing

dev/core#4778 - php notice causes civi menu to go missing

12 months agoMerge pull request #28000 from seamuslee001/guzzle_update
demeritcowboy [Wed, 15 Nov 2023 20:01:38 +0000 (15:01 -0500)]
Merge pull request #28000 from seamuslee001/guzzle_update

Update Guzzle to 7.6.1 for Drupal 7/Backdrop/WordPress/Joomla

12 months agophp notice
demeritcowboy [Wed, 15 Nov 2023 19:10:28 +0000 (14:10 -0500)]
php notice

12 months agoMerge pull request #28143 from eileenmcnaughton/online_cont_tax_check
demeritcowboy [Wed, 15 Nov 2023 18:38:54 +0000 (13:38 -0500)]
Merge pull request #28143 from eileenmcnaughton/online_cont_tax_check

Add test cover for tax details in Dummy payment online contribution receipt

12 months agoMerge pull request #28149 from civicrm/5.68
demeritcowboy [Wed, 15 Nov 2023 18:03:44 +0000 (13:03 -0500)]
Merge pull request #28149 from civicrm/5.68

5.68

12 months agoMerge pull request #28136 from ErikHommel/master
demeritcowboy [Wed, 15 Nov 2023 16:16:23 +0000 (11:16 -0500)]
Merge pull request #28136 from ErikHommel/master

fix issue #4770 Ensure the followup_assignee_contact_id is an array so all assignees are saved, not just the first one

12 months agoMerge pull request #28145 from colemanw/parentNames
colemanw [Wed, 15 Nov 2023 16:11:12 +0000 (11:11 -0500)]
Merge pull request #28145 from colemanw/parentNames

dev/core#4740 - Fix missing tagsets when label doesn't match name

12 months agoMerge pull request #28117 from demeritcowboy/casedashboard-warnings2
Mathieu Lu [Wed, 15 Nov 2023 14:38:16 +0000 (09:38 -0500)]
Merge pull request #28117 from demeritcowboy/casedashboard-warnings2

[php8] php warnings on case dashboard

12 months agoMerge pull request #28146 from seamuslee001/fix_tests
demeritcowboy [Wed, 15 Nov 2023 14:03:30 +0000 (09:03 -0500)]
Merge pull request #28146 from seamuslee001/fix_tests

[REF] Fix test fails caused by changes to mailing footer

12 months agoMerge pull request #28070 from eileenmcnaughton/participant_backoffice
colemanw [Wed, 15 Nov 2023 13:54:30 +0000 (08:54 -0500)]
Merge pull request #28070 from eileenmcnaughton/participant_backoffice

Clean up contributionParams - backoffice participant form

12 months agofix on review
Erik Hommel [Wed, 15 Nov 2023 13:42:38 +0000 (14:42 +0100)]
fix on review

Co-authored-by: demeritcowboy <demeritcowboy@hotmail.com>
12 months agoMerge pull request #28119 from lcdservices/dev-core-4772
Tim Otten [Wed, 15 Nov 2023 07:55:45 +0000 (00:55 -0700)]
Merge pull request #28119 from lcdservices/dev-core-4772

dev/core#4772 fix authx on Joomla

12 months ago[REF] Fix test fails caused by changes to mailing footer
Seamus Lee [Wed, 15 Nov 2023 05:05:16 +0000 (16:05 +1100)]
[REF] Fix test fails caused by changes to mailing footer

12 months agoUpdate Guzzle to 7.6.1 for Drupal 7/Backdrop/WordPress/Joomla
Seamus Lee [Thu, 2 Nov 2023 21:51:06 +0000 (08:51 +1100)]
Update Guzzle to 7.6.1 for Drupal 7/Backdrop/WordPress/Joomla

12 months agodev/core#4740 - Fix missing tagsets when label doesn't match name
colemanw [Wed, 15 Nov 2023 01:10:38 +0000 (20:10 -0500)]
dev/core#4740 - Fix missing tagsets when label doesn't match name

CRM_Core_Form_Tag::buildQuickForm was previously being passed an array of [id => name]
but it was wastefully ignoring the passed ids and looking it up from the name.

Now due to bcf668d is being passed an array of [id => label] which is all it needs,
just had to remove the wasteful id lookup when it's already there.

12 months agoMerge pull request #28142 from eileenmcnaughton/notice_cms
Eileen McNaughton [Wed, 15 Nov 2023 01:07:09 +0000 (14:07 +1300)]
Merge pull request #28142 from eileenmcnaughton/notice_cms

Fix notice on showCMS:

12 months agoMerge pull request #28133 from colemanw/civiCasePerms
colemanw [Wed, 15 Nov 2023 00:48:55 +0000 (19:48 -0500)]
Merge pull request #28133 from colemanw/civiCasePerms

dev/core#4769 APIv4 - Fix access to case activities for administrators

12 months agoMerge pull request #28141 from eileenmcnaughton/object_notice
Eileen McNaughton [Tue, 14 Nov 2023 23:21:37 +0000 (12:21 +1300)]
Merge pull request #28141 from eileenmcnaughton/object_notice

Fix notice on payment processor object

12 months agoReplace math in template with variable, smarty3 support
Eileen McNaughton [Tue, 14 Nov 2023 22:59:59 +0000 (11:59 +1300)]
Replace math in template with variable, smarty3 support

The handling for math in smarty2 & 3 differs wrt precedence, when used
with a modifier. It's a bit tricky supporting both but in this
case we can simply rely on another key in the array that already exists
and is equivalent

Note that the membership online template is excluded deliberately for now
as it does not currently access the same lineItems variable
as all the other templates

12 months agoAdd test cover for tax details in Dummy payment online contribution receipt
Eileen McNaughton [Tue, 14 Nov 2023 22:52:28 +0000 (11:52 +1300)]
Add test cover for tax details in Dummy payment online contribution receipt

12 months agoFix notice on showCMS:
Eileen McNaughton [Tue, 14 Nov 2023 22:27:38 +0000 (11:27 +1300)]
Fix notice on showCMS:

12 months agoFix notice on payment processor object
Eileen McNaughton [Tue, 14 Nov 2023 22:22:28 +0000 (11:22 +1300)]
Fix notice on payment processor object

12 months agoMerge pull request #28138 from eileenmcnaughton/online_cont_tax_check
demeritcowboy [Tue, 14 Nov 2023 22:10:57 +0000 (17:10 -0500)]
Merge pull request #28138 from eileenmcnaughton/online_cont_tax_check

Check tax is present in online contribution page receipt

12 months agoRemove last references to _contributeMode
Eileen McNaughton [Tue, 14 Nov 2023 21:39:44 +0000 (10:39 +1300)]
Remove last references to _contributeMode

12 months agoMerge pull request #28065 from eileenmcnaughton/event_text
Eileen McNaughton [Tue, 14 Nov 2023 21:35:56 +0000 (10:35 +1300)]
Merge pull request #28065 from eileenmcnaughton/event_text

Replace last tpl uses of `contributeMode`

12 months agoCheck tax is present in online contribution page receipt
Eileen McNaughton [Tue, 14 Nov 2023 19:27:48 +0000 (08:27 +1300)]
Check tax is present in online contribution page receipt

12 months agoReplace last tpl uses of contributeMode
Eileen McNaughton [Fri, 22 Sep 2023 22:27:22 +0000 (10:27 +1200)]
Replace last tpl uses of contributeMode

This adds the strings to what the processor can determin, allowing us to stop checkign contributeMode

12 months agoMerge pull request #28053 from agileware/CIVICRM-2190
Mathieu Lu [Tue, 14 Nov 2023 20:44:14 +0000 (15:44 -0500)]
Merge pull request #28053 from agileware/CIVICRM-2190

Default mailing footer component incorrectly describes opt-out action as unsubscribe

12 months agoMerge pull request #28061 from jaapjansma/l10n_downloader
demeritcowboy [Tue, 14 Nov 2023 19:23:01 +0000 (14:23 -0500)]
Merge pull request #28061 from jaapjansma/l10n_downloader

Setup: able to download translation files automatically

12 months agoMerge pull request #28033 from colemanw/assetCheck
demeritcowboy [Tue, 14 Nov 2023 18:09:25 +0000 (13:09 -0500)]
Merge pull request #28033 from colemanw/assetCheck

dev/core#4754 - Add status check to warn of missing/outdated public assets

12 months agoadded plugin to download l10n translation files
Jaap Jansma [Tue, 14 Nov 2023 16:16:22 +0000 (17:16 +0100)]
added plugin to download l10n translation files

12 months agoMerge pull request #28112 from colemanw/searchKitInputMode
colemanw [Tue, 14 Nov 2023 15:35:55 +0000 (10:35 -0500)]
Merge pull request #28112 from colemanw/searchKitInputMode

SearchKit - Add inputMode setting to allow clauses to reference column values

12 months agodev/core#4754 - Add status check to warn of missing/outdated public assets
colemanw [Tue, 7 Nov 2023 01:36:56 +0000 (20:36 -0500)]
dev/core#4754 - Add status check to warn of missing/outdated public assets

12 months agofix issue #4770
Erik Hommel [Tue, 14 Nov 2023 10:04:16 +0000 (11:04 +0100)]
fix issue #4770

Making sure the followup_assignee_contact_id is an array so all assignees are saved, not just the first one

12 months agoMerge pull request #28060 from eileenmcnaughton/error_verbose
Matthew Wire [Tue, 14 Nov 2023 09:11:22 +0000 (09:11 +0000)]
Merge pull request #28060 from eileenmcnaughton/error_verbose

Use `supportsNoReturn()` instead of contributeMode check

12 months agoMerge pull request #28135 from civicrm/5.68
Seamus Lee [Tue, 14 Nov 2023 02:51:48 +0000 (13:51 +1100)]
Merge pull request #28135 from civicrm/5.68

5.68

12 months agoMerge pull request #28130 from eileenmcnaughton/568
Seamus Lee [Tue, 14 Nov 2023 02:50:02 +0000 (13:50 +1100)]
Merge pull request #28130 from eileenmcnaughton/568

Update the parameters passed to the hook_QueueTaskError

12 months agoMerge pull request #28131 from civicrm/5.68
Seamus Lee [Tue, 14 Nov 2023 02:49:53 +0000 (13:49 +1100)]
Merge pull request #28131 from civicrm/5.68

5.68

12 months agoAPIv4 - Fix access to case activities for administrators
colemanw [Tue, 14 Nov 2023 01:57:26 +0000 (20:57 -0500)]
APIv4 - Fix access to case activities for administrators

Fixes dev/core#4769

Before: Case administrators with 'access deleted contacts' permission blocked from viewing Case activities in APIv4
After: Permissions work correctly.

The problem was the hook logic was incorrectly interpreting empty permissions to mean "no access"
when it actually means "unrestricted access".

12 months agoMove set up of complicated price set to the ContributionPageTestTrait & test to the...
Eileen McNaughton [Mon, 13 Nov 2023 18:19:51 +0000 (07:19 +1300)]
Move set up of complicated price set to the ContributionPageTestTrait & test to the confirmTest

We need to add some more testing but most of our existing tests are within the apiv3 test harness
which is not a great location. This moves one test over to the full form test flow
and also pimps the helper trait to support this complex price scenario (with fields
of a mixture of types & financial types.

I want to add some checks on the email output but this specific test is pay later
so I won't do it in this PR

12 months agoMerge pull request #28128 from seamuslee001/dev_core_4768_568
demeritcowboy [Tue, 14 Nov 2023 01:23:27 +0000 (20:23 -0500)]
Merge pull request #28128 from seamuslee001/dev_core_4768_568

dev/core#4768 Fix validating contact when using checksum url

12 months agoUpdate the parameters passed to the hook_QueueTaskError
Adedoyin Damilare [Mon, 13 Nov 2023 19:59:27 +0000 (19:59 +0000)]
Update the parameters passed to the hook_QueueTaskError

Issue: https://lab.civicrm.org/dev/core/-/issues/4774

12 months agoMerge pull request #28124 from colemanw/fixApi4QueryRegression
colemanw [Tue, 14 Nov 2023 00:16:53 +0000 (19:16 -0500)]
Merge pull request #28124 from colemanw/fixApi4QueryRegression

dev/core#4773 - Fix APIv4 query regression

12 months agoAdd unit test
Seamus Lee [Mon, 13 Nov 2023 23:43:57 +0000 (10:43 +1100)]
Add unit test

12 months agoMerge pull request #28120 from demeritcowboy/regen
Eileen McNaughton [Mon, 13 Nov 2023 22:55:18 +0000 (11:55 +1300)]
Merge pull request #28120 from demeritcowboy/regen

Regen after 28096

12 months agoMerge pull request #28126 from civicrm/5.68
Eileen McNaughton [Mon, 13 Nov 2023 22:54:55 +0000 (11:54 +1300)]
Merge pull request #28126 from civicrm/5.68

5.68

12 months agodev/core#4768 Fix validating contact when using checksum url
Seamus Lee [Mon, 13 Nov 2023 21:58:09 +0000 (08:58 +1100)]
dev/core#4768 Fix validating contact when using checksum url

Fix type error failures

12 months agoMerge pull request #28123 from Damilare1/master
Seamus Lee [Mon, 13 Nov 2023 20:48:42 +0000 (07:48 +1100)]
Merge pull request #28123 from Damilare1/master

Update the parameters passed to the hook_QueueTaskError

12 months agoMerge pull request #28121 from colemanw/contact_autocomplete_options
Seamus Lee [Mon, 13 Nov 2023 20:46:38 +0000 (07:46 +1100)]
Merge pull request #28121 from colemanw/contact_autocomplete_options

dev/core#4759 - Respect Autocomplete Contact Search preferences in menubar quicksearch

12 months agodev/core#4773 - Fix APIv4 query regression
colemanw [Mon, 13 Nov 2023 20:42:09 +0000 (15:42 -0500)]
dev/core#4773 - Fix APIv4 query regression

12 months agoMerge pull request #28080 from MegaphoneJon/badge-layout-another-fix
Eileen McNaughton [Mon, 13 Nov 2023 20:30:08 +0000 (09:30 +1300)]
Merge pull request #28080 from MegaphoneJon/badge-layout-another-fix

Updated fix for badge layouts

12 months agoUpdate the parameters passed to the hook_QueueTaskError
Adedoyin Damilare [Mon, 13 Nov 2023 19:59:27 +0000 (19:59 +0000)]
Update the parameters passed to the hook_QueueTaskError

Issue: https://lab.civicrm.org/dev/core/-/issues/4774

12 months agodev/core#4759 - Respect Autocomplete Contact Search preferences in menubar quicksearch
colemanw [Mon, 13 Nov 2023 19:43:40 +0000 (14:43 -0500)]
dev/core#4759 - Respect Autocomplete Contact Search preferences in menubar quicksearch

12 months agoFix for badge layouts take 3
Jon Goldberg [Thu, 9 Nov 2023 17:01:09 +0000 (12:01 -0500)]
Fix for badge layouts take 3

12 months agoregen
demeritcowboy [Mon, 13 Nov 2023 19:07:07 +0000 (14:07 -0500)]
regen

12 months agoMerge pull request #28096 from eileenmcnaughton/online_cont_notice
demeritcowboy [Mon, 13 Nov 2023 18:58:19 +0000 (13:58 -0500)]
Merge pull request #28096 from eileenmcnaughton/online_cont_notice

Blank out membership_online_receipt - text version

12 months agodev/core#4772 fix authx on Joomla
Brian Shaughnessy [Mon, 13 Nov 2023 18:20:00 +0000 (13:20 -0500)]
dev/core#4772 fix authx on Joomla

12 months agoBlank out membership_online_receipt - text version
Eileen McNaughton [Fri, 10 Nov 2023 05:23:57 +0000 (18:23 +1300)]
Blank out membership_online_receipt - text version

As with the offline event receipt this reduces the maintenance effort, given that
we generate a text version anyway

12 months agoupdate test
demeritcowboy [Mon, 13 Nov 2023 15:17:16 +0000 (10:17 -0500)]
update test

12 months agophp warnings on case dashboard
demeritcowboy [Mon, 13 Nov 2023 05:05:07 +0000 (00:05 -0500)]
php warnings on case dashboard

12 months agoMerge pull request #28116 from demeritcowboy/regen
demeritcowboy [Mon, 13 Nov 2023 15:34:10 +0000 (10:34 -0500)]
Merge pull request #28116 from demeritcowboy/regen

Regen after 28052

12 months agoMerge pull request #28118 from civicrm/5.68
demeritcowboy [Mon, 13 Nov 2023 15:23:39 +0000 (10:23 -0500)]
Merge pull request #28118 from civicrm/5.68

5.68

12 months agoMerge pull request #28103 from colemanw/tagIndividuals
demeritcowboy [Mon, 13 Nov 2023 14:19:52 +0000 (09:19 -0500)]
Merge pull request #28103 from colemanw/tagIndividuals

APIv4 - Fix missing tag filer on Individual,Organization,Household

12 months agoregen
demeritcowboy [Mon, 13 Nov 2023 14:03:39 +0000 (09:03 -0500)]
regen

12 months agoMerge pull request #28013 from agileware/CIVICRM-2188
Seamus Lee [Mon, 13 Nov 2023 06:14:00 +0000 (17:14 +1100)]
Merge pull request #28013 from agileware/CIVICRM-2188

Pass year to mktime as int in CRM_Contribution_Form_ContributionCharts

12 months agoCIVICRM-2188 Pass year to mktime as int in CRM_Contribution_Form_ContributionCharts
Francis Whittle [Fri, 3 Nov 2023 03:12:47 +0000 (14:12 +1100)]
CIVICRM-2188 Pass year to mktime as int in CRM_Contribution_Form_ContributionCharts

Prevents fatal error in PHP 8.1

12 months agoMerge pull request #28052 from agileware/CIVICRM-2189
colemanw [Mon, 13 Nov 2023 00:53:05 +0000 (19:53 -0500)]
Merge pull request #28052 from agileware/CIVICRM-2189

Revisit the default Scheduled Jobs. Adjust the frequency…

13 months agoMerge pull request #28106 from braders/groupcontact-context
Eileen McNaughton [Sun, 12 Nov 2023 20:26:41 +0000 (09:26 +1300)]
Merge pull request #28106 from braders/groupcontact-context

[REF][PHP8.2] Declare properties in CRM_Contact_Form_GroupContact

13 months agoMerge pull request #28107 from braders/badge-context
Eileen McNaughton [Sun, 12 Nov 2023 20:26:11 +0000 (09:26 +1300)]
Merge pull request #28107 from braders/badge-context

[REF][PHP8.2] Declare properties in CRM_Event_Form_Task_Badge

13 months agoMerge pull request #28114 from civicrm/5.68
Eileen McNaughton [Sun, 12 Nov 2023 20:25:43 +0000 (09:25 +1300)]
Merge pull request #28114 from civicrm/5.68

5.68

13 months agoMerge pull request #28113 from jitendrapurohit/reminder-error-rc
colemanw [Sun, 12 Nov 2023 13:31:15 +0000 (08:31 -0500)]
Merge pull request #28113 from jitendrapurohit/reminder-error-rc

Schedule Job fails with a fatal error if configured with an absolute date

13 months agoFix reminder error with absolute date
Jitendra Purohit [Sun, 12 Nov 2023 05:45:47 +0000 (11:15 +0530)]
Fix reminder error with absolute date

13 months agoMerge pull request #28108 from braders/php82-membershiptest
Seamus Lee [Sat, 11 Nov 2023 22:54:54 +0000 (09:54 +1100)]
Merge pull request #28108 from braders/php82-membershiptest

[REF][PHP8.2] Fix MembershipTest on PHP 8.2

13 months agoMerge pull request #28110 from braders/php8.2-subscription-details-property
colemanw [Sat, 11 Nov 2023 22:03:12 +0000 (17:03 -0500)]
Merge pull request #28110 from braders/php8.2-subscription-details-property

[REF][PHP8.2] Ensure _subscriptionDetails is consistently declared

13 months agoMerge pull request #28111 from braders/php8.2-batchformentry
colemanw [Sat, 11 Nov 2023 22:02:21 +0000 (17:02 -0500)]
Merge pull request #28111 from braders/php8.2-batchformentry

[REF][PHP8.2] Update CRM_Batch_Form_Entry

13 months agoSearchKit - Add inputMode setting to allow clauses to reference column values
colemanw [Sat, 11 Nov 2023 20:45:25 +0000 (15:45 -0500)]
SearchKit - Add inputMode setting to allow clauses to reference column values

Before: The WHERE or ON clauses could only use literal values e.g. first_name = 'Bob'
After: Clauses have a mode to allow colum references e.g. first_name = nick_name

13 months agoMerge pull request #28109 from braders/php8.2-self-svc-update
demeritcowboy [Sat, 11 Nov 2023 18:27:04 +0000 (13:27 -0500)]
Merge pull request #28109 from braders/php8.2-self-svc-update

[REF][PHP8.2] Cleanup CRM_Event_Form_SelfSvcUpdate

13 months ago[REF][PHP8.2] Update CRM_Batch_Form_Entry
Bradley Taylor [Sat, 11 Nov 2023 17:51:20 +0000 (17:51 +0000)]
[REF][PHP8.2] Update CRM_Batch_Form_Entry

13 months ago[REF][PHP8.2] Cleanup CRM_Event_Form_SelfSvcUpdate
Bradley Taylor [Sat, 11 Nov 2023 17:22:47 +0000 (17:22 +0000)]
[REF][PHP8.2] Cleanup CRM_Event_Form_SelfSvcUpdate

13 months ago[REF][PHP8.2] Ensure _subscriptionDetails is consistently declared
Bradley Taylor [Sat, 11 Nov 2023 17:35:43 +0000 (17:35 +0000)]
[REF][PHP8.2] Ensure _subscriptionDetails is consistently declared

13 months ago[REF][PHP8.2] Fix MembershipTest on PHP 8.2
Bradley Taylor [Sat, 11 Nov 2023 17:12:39 +0000 (17:12 +0000)]
[REF][PHP8.2] Fix MembershipTest on PHP 8.2

13 months ago[REF][PHP8.2] Declare properties in CRM_Event_Form_Task_Badge
Bradley Taylor [Sat, 11 Nov 2023 17:07:41 +0000 (17:07 +0000)]
[REF][PHP8.2] Declare properties in CRM_Event_Form_Task_Badge

13 months ago[REF][PHP8.2] Declare properties in CRM_Contact_Form_GroupContact
Bradley Taylor [Sat, 11 Nov 2023 17:00:49 +0000 (17:00 +0000)]
[REF][PHP8.2] Declare properties in CRM_Contact_Form_GroupContact

13 months agoAPIv4 - Fix missing tag filer on Individual,Organization,Household entities
colemanw [Fri, 10 Nov 2023 18:59:01 +0000 (13:59 -0500)]
APIv4 - Fix missing tag filer on Individual,Organization,Household entities

13 months agoMerge pull request #28098 from eileenmcnaughton/notice_info
demeritcowboy [Fri, 10 Nov 2023 13:11:31 +0000 (08:11 -0500)]
Merge pull request #28098 from eileenmcnaughton/notice_info

Fix notice on intro_text when none configured for the page

13 months agoMerge pull request #28100 from eileenmcnaughton/smarty3_options
Eileen McNaughton [Fri, 10 Nov 2023 07:17:39 +0000 (20:17 +1300)]
Merge pull request #28100 from eileenmcnaughton/smarty3_options

Remove extraneous space, breaks smarty3

13 months agoMerge pull request #28101 from civicrm/5.68
Eileen McNaughton [Fri, 10 Nov 2023 07:11:06 +0000 (20:11 +1300)]
Merge pull request #28101 from civicrm/5.68

5.68 to master

13 months agoMerge pull request #28099 from eileenmcnaughton/568
Eileen McNaughton [Fri, 10 Nov 2023 07:10:28 +0000 (20:10 +1300)]
Merge pull request #28099 from eileenmcnaughton/568

Fix rc-unreleased regression - tax amount not loading

13 months agoRemove extraneous space, breaks smarty3
Eileen McNaughton [Fri, 10 Nov 2023 06:34:40 +0000 (19:34 +1300)]
Remove extraneous space, breaks smarty3

13 months agoFix rc-unreleased regression - tax amount not loading
Eileen McNaughton [Fri, 10 Nov 2023 06:23:48 +0000 (19:23 +1300)]
Fix rc-unreleased regression - tax amount not loading

13 months agoMerge pull request #28091 from eileenmcnaughton/online_cont_main
Seamus Lee [Fri, 10 Nov 2023 06:13:45 +0000 (17:13 +1100)]
Merge pull request #28091 from eileenmcnaughton/online_cont_main

Add testing on emails for separate payment,

13 months agoFix notice on intro_text when none configured for the page
Eileen McNaughton [Fri, 10 Nov 2023 05:55:35 +0000 (18:55 +1300)]
Fix notice on intro_text when none configured for the page

13 months agoMerge pull request #28095 from eileenmcnaughton/online_cont_notice
colemanw [Fri, 10 Nov 2023 04:40:04 +0000 (23:40 -0500)]
Merge pull request #28095 from eileenmcnaughton/online_cont_notice

Fix notice on is_quick_config - Main contribution page

13 months agoFix notice on is_quick_config
Eileen McNaughton [Fri, 10 Nov 2023 03:41:00 +0000 (16:41 +1300)]
Fix notice on is_quick_config

is_quick_config is only assigned when a payment is being made on an existing
contribution - this was a bit hard to figure out so I switched to using
a variable that explicitly says what it means (rather than guess at ccid)
and ensured that is_quick_config was only accessed within these blocks

Also, I pulled the assignment on the Dummy processor name from out of
the unrelated function

13 months agoMerge pull request #28094 from civicrm/5.68
demeritcowboy [Fri, 10 Nov 2023 03:52:39 +0000 (22:52 -0500)]
Merge pull request #28094 from civicrm/5.68

5.68