civicrm-core.git
23 months agodev/core#4158 Fix incorrect option_group update in paypal recurring
Eileen McNaughton [Fri, 3 Mar 2023 05:41:32 +0000 (18:41 +1300)]
dev/core#4158 Fix incorrect option_group update in paypal recurring

This line was pointed out as being problematic in the issue
https://lab.civicrm.org/dev/core/-/issues/4158 and in a test
I was able to verify it causes issues if the value for Completed
in the contribution status option group is not the same as the
contribution recur option group. However, it appears to
be more of a theoretical / test creatable regression than a real
world one & is not a credible fix for the bug.

I think an rc merge without a stable back port is OK

23 months agoMerge pull request #25704 from totten/5.59-token-mismatch
Tim Otten [Thu, 2 Mar 2023 22:45:41 +0000 (14:45 -0800)]
Merge pull request #25704 from totten/5.59-token-mismatch

(dev/core#4147) Add test and fix for various flaky tokens

2 years agoApi4 - Rename Worldregion to WorldRegion
Tim Otten [Thu, 2 Mar 2023 08:22:40 +0000 (00:22 -0800)]
Api4 - Rename Worldregion to WorldRegion

2 years agoWorldregion - For API-entity-naming, prefer "WorldRegion"
Tim Otten [Thu, 2 Mar 2023 05:53:53 +0000 (21:53 -0800)]
Worldregion - For API-entity-naming, prefer "WorldRegion"

2 years agoSet version to 5.60.beta1
CiviCRM [Thu, 2 Mar 2023 01:32:11 +0000 (01:32 +0000)]
Set version to 5.60.beta1

2 years agoStyle
Eileen McNaughton [Wed, 1 Mar 2023 22:56:05 +0000 (11:56 +1300)]
Style

2 years agoMerge pull request #25706 from eileenmcnaughton/strict
Eileen McNaughton [Wed, 1 Mar 2023 22:46:58 +0000 (11:46 +1300)]
Merge pull request #25706 from eileenmcnaughton/strict

Stricter typing in Apiv4

2 years agoSigh, and they have colons:
Eileen McNaughton [Wed, 1 Mar 2023 22:21:37 +0000 (11:21 +1300)]
Sigh, and they have colons:

2 years agoFix key mismatch
Eileen McNaughton [Wed, 1 Mar 2023 22:20:16 +0000 (11:20 +1300)]
Fix key mismatch

2 years agoFix preferred_communication method
Eileen McNaughton [Wed, 1 Mar 2023 22:19:02 +0000 (11:19 +1300)]
Fix preferred_communication method

Also fix over-aggressive test assertion

2 years agoFix region token
Eileen McNaughton [Wed, 1 Mar 2023 21:56:43 +0000 (10:56 +1300)]
Fix region token

2 years agoStricter typing in Apiv4
Eileen McNaughton [Wed, 1 Mar 2023 21:49:40 +0000 (10:49 +1300)]
Stricter typing in Apiv4

2 years agoAdd Worldregion api for join
Eileen McNaughton [Wed, 1 Mar 2023 21:47:44 +0000 (10:47 +1300)]
Add Worldregion api for join

2 years agoFix for unresolved state_province
Eileen McNaughton [Wed, 1 Mar 2023 21:47:26 +0000 (10:47 +1300)]
Fix for unresolved state_province

2 years agoMerge pull request #25705 from eileenmcnaughton/dep
colemanw [Wed, 1 Mar 2023 21:03:00 +0000 (16:03 -0500)]
Merge pull request #25705 from eileenmcnaughton/dep

Remove deprecated function calls to Event::del, Membership functions del, OptionValue

2 years agoRename variable - I figured out what it meant
Eileen McNaughton [Wed, 1 Mar 2023 20:09:49 +0000 (09:09 +1300)]
Rename variable - I figured out what it meant

2 years agoAdhere to comment block code standard
Eileen McNaughton [Wed, 1 Mar 2023 20:08:31 +0000 (09:08 +1300)]
Adhere to comment block code standard

Standard is short one liner first:

2 years agoSuperficial test cleanup, protect variable
Eileen McNaughton [Wed, 1 Mar 2023 20:07:37 +0000 (09:07 +1300)]
Superficial test cleanup, protect variable

2 years agoAdd phpdoc to prevent restoreTime being removed
Eileen McNaughton [Wed, 1 Mar 2023 20:05:46 +0000 (09:05 +1300)]
Add phpdoc to prevent restoreTime being removed

These unused variables cause quite a few bugs - keeping them 'matters' but
they look like they can go and people doing that happens moderately often,
causing bugs (this has been the cause of more than one 'locks don't work bug'

2 years agoRemove some calls to OptionValue deleteRecord
Eileen McNaughton [Wed, 1 Mar 2023 19:51:53 +0000 (08:51 +1300)]
Remove some calls to OptionValue deleteRecord

2 years agoDeprecations in Event, Membership
Eileen McNaughton [Wed, 1 Mar 2023 19:48:57 +0000 (08:48 +1300)]
Deprecations in Event, Membership

Per https://github.com/civicrm/civicrm-core/pull/25677

2 years agoStop calling deprectated del function
Eileen McNaughton [Wed, 1 Mar 2023 19:44:34 +0000 (08:44 +1300)]
Stop calling deprectated del function

2 years ago(dev/core#4147) Add scenario testTokensIndividually
Tim Otten [Wed, 1 Mar 2023 09:12:49 +0000 (01:12 -0800)]
(dev/core#4147) Add scenario testTokensIndividually

2 years ago(REF) MessageTemplateTest - Extract method useFrozenTime()
Tim Otten [Wed, 1 Mar 2023 09:10:40 +0000 (01:10 -0800)]
(REF) MessageTemplateTest - Extract method useFrozenTime()

2 years agoMerge pull request #25702 from civicrm/5.59
Eileen McNaughton [Wed, 1 Mar 2023 06:34:22 +0000 (19:34 +1300)]
Merge pull request #25702 from civicrm/5.59

5.59

2 years agoMerge pull request #25698 from colemanw/removeIds
Yashodha Chaku [Wed, 1 Mar 2023 04:42:43 +0000 (10:12 +0530)]
Merge pull request #25698 from colemanw/removeIds

Remove deprecated use of $ids

2 years agoMerge pull request #25701 from alifrumin/5.59rn
Yashodha Chaku [Wed, 1 Mar 2023 04:40:51 +0000 (10:10 +0530)]
Merge pull request #25701 from alifrumin/5.59rn

[NFC] 5.59 release notes sorting and annotating

2 years ago[NFC] 5.59 release notes sorting and annotating
Alice Frumin [Wed, 1 Mar 2023 03:56:11 +0000 (22:56 -0500)]
[NFC] 5.59 release notes sorting and annotating

2 years agoMerge pull request #25699 from civicrm/5.59
Eileen McNaughton [Wed, 1 Mar 2023 02:51:57 +0000 (15:51 +1300)]
Merge pull request #25699 from civicrm/5.59

5.59 to master

2 years agoMerge pull request #25697 from agh1/5.59.0-releasenotes-initial
Eileen McNaughton [Wed, 1 Mar 2023 02:51:34 +0000 (15:51 +1300)]
Merge pull request #25697 from agh1/5.59.0-releasenotes-initial

5.59.0 releasenotes initial run

2 years agoMerge pull request #25639 from eileenmcnaughton/import_validate
Tim Otten [Wed, 1 Mar 2023 01:44:30 +0000 (17:44 -0800)]
Merge pull request #25639 from eileenmcnaughton/import_validate

dev/core#4132 Fix import for multi-custom boxes

2 years agoRemove deprecated use of $ids
Coleman Watts [Wed, 1 Mar 2023 01:32:09 +0000 (20:32 -0500)]
Remove deprecated use of $ids

2 years ago5.59.0 release notes: added boilerplate
Andie Hunt [Wed, 1 Mar 2023 01:26:08 +0000 (20:26 -0500)]
5.59.0 release notes: added boilerplate

2 years ago5.59.0 release notes: raw from script
Andie Hunt [Wed, 1 Mar 2023 01:21:59 +0000 (20:21 -0500)]
5.59.0 release notes: raw from script

2 years agoMerge pull request #25696 from colemanw/delDep
colemanw [Wed, 1 Mar 2023 00:57:11 +0000 (19:57 -0500)]
Merge pull request #25696 from colemanw/delDep

Delete long-deprecated functions

2 years agoMerge pull request #25695 from eileenmcnaughton/CRM/Block
colemanw [Wed, 1 Mar 2023 00:22:38 +0000 (19:22 -0500)]
Merge pull request #25695 from eileenmcnaughton/CRM/Block

Pull over a few more deprecations + blockDelete deprecation

2 years agoDelete long-deprecated functions
Coleman Watts [Wed, 1 Mar 2023 00:04:36 +0000 (19:04 -0500)]
Delete long-deprecated functions

2 years agoPull over a few more deprecations + blockDelete deprecation
Eileen McNaughton [Tue, 28 Feb 2023 23:48:27 +0000 (12:48 +1300)]
Pull over a few more deprecations + blockDelete deprecation

2 years agoMerge pull request #25693 from eileenmcnaughton/CRM/Block
Eileen McNaughton [Tue, 28 Feb 2023 23:45:38 +0000 (12:45 +1300)]
Merge pull request #25693 from eileenmcnaughton/CRM/Block

Address portions of deprecated code replacement

2 years agoAddress portions of deprecated code replacement
Eileen McNaughton [Tue, 28 Feb 2023 22:31:22 +0000 (11:31 +1300)]
Address portions of deprecated code replacement

2 years agoMerge pull request #25691 from eileenmcnaughton/dep_mailing
colemanw [Tue, 28 Feb 2023 22:07:48 +0000 (17:07 -0500)]
Merge pull request #25691 from eileenmcnaughton/dep_mailing

Deprecations for Mailing::delete functions

2 years agoMerge pull request #25690 from eileenmcnaughton/dep_test
Eileen McNaughton [Tue, 28 Feb 2023 21:49:55 +0000 (10:49 +1300)]
Merge pull request #25690 from eileenmcnaughton/dep_test

Deprecations for delete on ACL entities

2 years agoDeprecations for Mailing::delete functions
Eileen McNaughton [Tue, 28 Feb 2023 21:01:23 +0000 (10:01 +1300)]
Deprecations for Mailing::delete functions

2 years agoDeprecations for delete on ACL entities
Eileen McNaughton [Tue, 28 Feb 2023 20:51:03 +0000 (09:51 +1300)]
Deprecations for delete on ACL entities

2 years agoMerge pull request #25688 from eileenmcnaughton/dep_test
Seamus Lee [Tue, 28 Feb 2023 20:10:29 +0000 (07:10 +1100)]
Merge pull request #25688 from eileenmcnaughton/dep_test

Remove deprecated functions from tests

2 years agoRemove deprecated functions from tests
Eileen McNaughton [Tue, 28 Feb 2023 18:48:22 +0000 (07:48 +1300)]
Remove deprecated functions from tests

2 years agoMerge pull request #25686 from eileenmcnaughton/dep_2020_address
Eileen McNaughton [Tue, 28 Feb 2023 06:02:16 +0000 (19:02 +1300)]
Merge pull request #25686 from eileenmcnaughton/dep_2020_address

Remove 2020-deprecated handling of `legacyAddressCreate`

2 years agoMerge pull request #25685 from eileenmcnaughton/dep_2020
Yashodha Chaku [Tue, 28 Feb 2023 03:16:00 +0000 (08:46 +0530)]
Merge pull request #25685 from eileenmcnaughton/dep_2020

Remove function noisily deprecated when the world was young (2020)

2 years agoMerge pull request #25684 from eileenmcnaughton/address_delete
Yashodha Chaku [Tue, 28 Feb 2023 03:14:00 +0000 (08:44 +0530)]
Merge pull request #25684 from eileenmcnaughton/address_delete

Remove deprecated function call

2 years agoMerge pull request #25646 from colemanw/fixSearchDisplayFilter
Eileen McNaughton [Tue, 28 Feb 2023 02:28:15 +0000 (15:28 +1300)]
Merge pull request #25646 from colemanw/fixSearchDisplayFilter

Afform - Filter autocomplete fields belonging to a search display

2 years agoRemove 2020-deprecated handline of legacyAddressCreate
Eileen McNaughton [Tue, 28 Feb 2023 02:24:31 +0000 (15:24 +1300)]
Remove 2020-deprecated handline of legacyAddressCreate

2 years agoRemove function noisily deprecated when the world was young (2020)
Eileen McNaughton [Tue, 28 Feb 2023 02:01:49 +0000 (15:01 +1300)]
Remove function noisily deprecated when the world was young (2020)

2 years agoMerge pull request #25669 from eileenmcnaughton/smarty-syntax
demeritcowboy [Tue, 28 Feb 2023 01:53:40 +0000 (20:53 -0500)]
Merge pull request #25669 from eileenmcnaughton/smarty-syntax

dev/core#4146 Remove (old) Smarty-forward incompatible syntax from Address.tpl

2 years agoMerge pull request #25683 from eileenmcnaughton/logging_dep
demeritcowboy [Tue, 28 Feb 2023 01:34:09 +0000 (20:34 -0500)]
Merge pull request #25683 from eileenmcnaughton/logging_dep

Add gentle deprecation to `debug_log_message`

2 years agoMerge pull request #25682 from eileenmcnaughton/log_smarty
demeritcowboy [Tue, 28 Feb 2023 01:25:34 +0000 (20:25 -0500)]
Merge pull request #25682 from eileenmcnaughton/log_smarty

Log Smarty debug to it's own channel

2 years agoMerge pull request #25680 from eileenmcnaughton/smarty-bank
demeritcowboy [Tue, 28 Feb 2023 01:05:03 +0000 (20:05 -0500)]
Merge pull request #25680 from eileenmcnaughton/smarty-bank

Smarty notice fix on bank_account_number

2 years agoRemove deprecated function call
Eileen McNaughton [Tue, 28 Feb 2023 00:54:38 +0000 (13:54 +1300)]
Remove deprecated function call

2 years agoMerge pull request #25678 from eileenmcnaughton/logging-ref
Eileen McNaughton [Tue, 28 Feb 2023 00:50:13 +0000 (13:50 +1300)]
Merge pull request #25678 from eileenmcnaughton/logging-ref

Remove unnecessary pass-by-reference

2 years agoAdd gentle deprecation to debug_log_message
Eileen McNaughton [Tue, 28 Feb 2023 00:47:52 +0000 (13:47 +1300)]
Add gentle deprecation to debug_log_message

2 years agoMerge pull request #25679 from eileenmcnaughton/deprecated_mem_type
colemanw [Tue, 28 Feb 2023 00:47:11 +0000 (19:47 -0500)]
Merge pull request #25679 from eileenmcnaughton/deprecated_mem_type

Remove code deprecated in 2018

2 years agoLog Smarty debug to it's own channel
Eileen McNaughton [Tue, 28 Feb 2023 00:36:47 +0000 (13:36 +1300)]
Log Smarty debug to it's own channel

I just wrote the docs on the right way to log using this example
https://docs.civicrm.org/dev/en/latest/framework/logging/

- so we should make it the same. I tested locally
& this results in the smarty debugging going to a separate file (good).

I personally think we should send all the IPN files off to their
own channel but am loath to be pro-active on changing that

2 years agoSmarty notice fix on bank_account_number
Eileen McNaughton [Mon, 27 Feb 2023 23:48:33 +0000 (12:48 +1300)]
Smarty notice fix on bank_account_number

2 years agoAlso remove CRM_Utils_Array call
Eileen McNaughton [Mon, 27 Feb 2023 23:23:23 +0000 (12:23 +1300)]
Also remove CRM_Utils_Array call

2 years agoRemove code deprecated in 2018
Eileen McNaughton [Mon, 27 Feb 2023 23:19:50 +0000 (12:19 +1300)]
Remove code deprecated in 2018

2 years agoMake function private
Eileen McNaughton [Mon, 27 Feb 2023 23:04:19 +0000 (12:04 +1300)]
Make function private

2 years agoRemove unnecessary pass-by-reference
Eileen McNaughton [Mon, 27 Feb 2023 23:01:52 +0000 (12:01 +1300)]
Remove unnecessary pass-by-reference

2 years agoMerge pull request #25675 from eileenmcnaughton/notice_location
demeritcowboy [Mon, 27 Feb 2023 21:44:16 +0000 (16:44 -0500)]
Merge pull request #25675 from eileenmcnaughton/notice_location

Remove empty on location - it should always be set now

2 years agoRemove empty on location - it should always be set now
Eileen McNaughton [Mon, 27 Feb 2023 19:56:51 +0000 (08:56 +1300)]
Remove empty on location - it should always be set now

See https://github.com/civicrm/civicrm-core/pull/25668

2 years agoMerge pull request #25618 from mattwire/caserelationship
colemanw [Mon, 27 Feb 2023 15:34:25 +0000 (10:34 -0500)]
Merge pull request #25618 from mattwire/caserelationship

Afform: Allow selecting case for relationship

2 years agoMerge pull request #25668 from eileenmcnaughton/notice_location
demeritcowboy [Mon, 27 Feb 2023 13:47:30 +0000 (08:47 -0500)]
Merge pull request #25668 from eileenmcnaughton/notice_location

Fix e-notice pattern around location not defined in formButtons.tpl

2 years agoMerge pull request #25309 from MegaphoneJon/flexmailer-return-path
demeritcowboy [Mon, 27 Feb 2023 13:44:36 +0000 (08:44 -0500)]
Merge pull request #25309 from MegaphoneJon/flexmailer-return-path

closes core#4070 - respect default return path

2 years agoMerge pull request #25585 from herbdool/core-4127-4
demeritcowboy [Mon, 27 Feb 2023 13:40:03 +0000 (08:40 -0500)]
Merge pull request #25585 from herbdool/core-4127-4

dev/core#4127 move cms user parameters to userSystem

2 years agoMerge pull request #25671 from colemanw/viewSql
Seamus Lee [Mon, 27 Feb 2023 03:58:11 +0000 (14:58 +1100)]
Merge pull request #25671 from colemanw/viewSql

SearchKit - Clarify how to view SQL output

2 years agoSearchKit - Clarify how to view SQL output
Coleman Watts [Mon, 27 Feb 2023 02:16:27 +0000 (21:16 -0500)]
SearchKit - Clarify how to view SQL output

2 years agoMerge pull request #25670 from eileenmcnaughton/cust_it
Seamus Lee [Sun, 26 Feb 2023 21:24:29 +0000 (08:24 +1100)]
Merge pull request #25670 from eileenmcnaughton/cust_it

Remove unused variables

2 years agoRemove unused variables
Eileen McNaughton [Tue, 7 Feb 2023 01:58:54 +0000 (14:58 +1300)]
Remove unused variables

2 years agoMerge pull request #25466 from eileenmcnaughton/sep
colemanw [Sun, 26 Feb 2023 02:42:48 +0000 (21:42 -0500)]
Merge pull request #25466 from eileenmcnaughton/sep

Remove unused property - not used since import code refactor `_lineCount`

2 years agoMerge pull request #25237 from eileenmcnaughton/mem_receipt
colemanw [Sun, 26 Feb 2023 02:41:42 +0000 (21:41 -0500)]
Merge pull request #25237 from eileenmcnaughton/mem_receipt

Remove conditional assignment around `is_deductible`

2 years agoMerge pull request #25621 from eileenmcnaughton/event_test_cleanup
colemanw [Sun, 26 Feb 2023 02:40:17 +0000 (21:40 -0500)]
Merge pull request #25621 from eileenmcnaughton/event_test_cleanup

Event test cleanup, fix test to use submitted form values, rather than require a lot of contorting

2 years agoMerge pull request #25270 from eileenmcnaughton/separate
colemanw [Sun, 26 Feb 2023 02:39:39 +0000 (21:39 -0500)]
Merge pull request #25270 from eileenmcnaughton/separate

Extend testing for ContributionConfirm & consolidate `isSeparateMembershipPayment`

2 years agoMerge pull request #25667 from eileenmcnaughton/mixin
Tim Otten [Sat, 25 Feb 2023 04:46:58 +0000 (20:46 -0800)]
Merge pull request #25667 from eileenmcnaughton/mixin

Fix mixin to use `addTemplateDir`

2 years agoRemove (old) Smarty-forward incompatible syntax from Address.tpl
Eileen McNaughton [Fri, 24 Feb 2023 22:54:41 +0000 (11:54 +1300)]
Remove (old) Smarty-forward incompatible syntax from Address.tpl

2 years agoFix e-notice pattern around location not defined in formButtons.tpl
Eileen McNaughton [Fri, 24 Feb 2023 21:19:08 +0000 (10:19 +1300)]
Fix e-notice pattern around location not defined in formButtons.tpl

2 years agoFix mixin
Eileen McNaughton [Fri, 24 Feb 2023 07:36:50 +0000 (20:36 +1300)]
Fix mixin

2 years agoMerge pull request #25662 from eileenmcnaughton/token_dep
demeritcowboy [Fri, 24 Feb 2023 19:02:25 +0000 (14:02 -0500)]
Merge pull request #25662 from eileenmcnaughton/token_dep

Add noisy deprecation to deprecated function, after universe search

2 years agodev/core#4127 move cms user parameters to userSystem
Herb v/d Dool [Wed, 15 Feb 2023 16:07:14 +0000 (11:07 -0500)]
dev/core#4127 move cms user parameters to userSystem

2 years agoMerge pull request #25665 from totten/master-nfc-url
Seamus Lee [Fri, 24 Feb 2023 09:37:18 +0000 (20:37 +1100)]
Merge pull request #25665 from totten/master-nfc-url

(NFC) crmURL - Add examples and whitespace. Crosslink docs.

2 years agoMerge pull request #25664 from eileenmcnaughton/tpl_fix
Tim Otten [Fri, 24 Feb 2023 08:14:12 +0000 (00:14 -0800)]
Merge pull request #25664 from eileenmcnaughton/tpl_fix

Remove forward incompatible syntax from template

2 years agocrmURL - Add examples and whitespace. Crosslink docs.
Tim Otten [Fri, 24 Feb 2023 07:43:10 +0000 (23:43 -0800)]
crmURL - Add examples and whitespace. Crosslink docs.

2 years agoMerge pull request #25661 from eileenmcnaughton/smarty-url
Tim Otten [Fri, 24 Feb 2023 06:59:23 +0000 (22:59 -0800)]
Merge pull request #25661 from eileenmcnaughton/smarty-url

Add `crmUrl function` to smarty in the standard way

2 years agoMerge pull request #25663 from eileenmcnaughton/civix
Eileen McNaughton [Fri, 24 Feb 2023 06:13:54 +0000 (19:13 +1300)]
Merge pull request #25663 from eileenmcnaughton/civix

run `civix update` on `recaptcha`, `legacyCustomSearches`, `financialacls`

2 years agoRemove forward incompatible syntax from template
Eileen McNaughton [Fri, 24 Feb 2023 05:45:11 +0000 (18:45 +1300)]
Remove forward incompatible syntax from template

2 years agoCivix upgrade on financialAcls
Eileen McNaughton [Fri, 24 Feb 2023 04:40:44 +0000 (17:40 +1300)]
Civix upgrade on financialAcls

2 years agoCivix update on legacyCustomSearches
Eileen McNaughton [Fri, 24 Feb 2023 04:34:55 +0000 (17:34 +1300)]
Civix update on legacyCustomSearches

2 years agoCivix update on Recaptcha
Eileen McNaughton [Fri, 24 Feb 2023 04:33:14 +0000 (17:33 +1300)]
Civix update on Recaptcha

2 years agoMerge pull request #25659 from totten/master-ext-up
Eileen McNaughton [Fri, 24 Feb 2023 04:30:10 +0000 (17:30 +1300)]
Merge pull request #25659 from totten/master-ext-up

ext/* - General update to civix v23.02.0

2 years agoAdd crmUrl function in the standard way
Eileen McNaughton [Tue, 17 Jan 2023 03:58:13 +0000 (16:58 +1300)]
Add crmUrl function in the standard way

Even during Smarty2 this method of registering functions was being phased out
for putting the file in the folder

2 years agoAdd noisy deprecation to deprecated function, after universe search
Eileen McNaughton [Fri, 24 Feb 2023 02:39:59 +0000 (15:39 +1300)]
Add noisy deprecation to deprecated function, after universe search

2 years agoMerge pull request #25653 from totten/master-htxt
Eileen McNaughton [Fri, 24 Feb 2023 02:32:57 +0000 (15:32 +1300)]
Merge pull request #25653 from totten/master-htxt

Smarty - {htxt} blocks should not be evaluated unless needed

2 years agoMerge pull request #25655 from MegaphoneJon/sub-history-date
Eileen McNaughton [Fri, 24 Feb 2023 02:32:34 +0000 (15:32 +1300)]
Merge pull request #25655 from MegaphoneJon/sub-history-date

HTML definition for subscription history date