civicrm-core.git
2 years agoMerge pull request #24157 from eileenmcnaughton/isDeleteRecord
demeritcowboy [Sat, 6 Aug 2022 13:10:16 +0000 (09:10 -0400)]
Merge pull request #24157 from eileenmcnaughton/isDeleteRecord

E-notice fix on Is delete record

2 years agoMerge pull request #24163 from colemanw/menubarRefreshFix
Seamus Lee [Fri, 5 Aug 2022 22:31:41 +0000 (08:31 +1000)]
Merge pull request #24163 from colemanw/menubarRefreshFix

Afform - Fix js error when checking to refresh menuBar

2 years agoAfform - Fix js error when checking to refresh menuBar
Coleman Watts [Fri, 5 Aug 2022 18:31:58 +0000 (14:31 -0400)]
Afform - Fix js error when checking to refresh menuBar

2 years agoAdd typing to child classed
Eileen McNaughton [Fri, 5 Aug 2022 04:02:06 +0000 (16:02 +1200)]
Add typing to child classed

2 years agoEnotice fix
Eileen McNaughton [Thu, 4 Aug 2022 22:20:38 +0000 (10:20 +1200)]
Enotice fix

2 years agoMerge pull request #24155 from yashodha/reports_improvements
Eileen McNaughton [Thu, 4 Aug 2022 21:15:35 +0000 (09:15 +1200)]
Merge pull request #24155 from yashodha/reports_improvements

(dev/core#3768) expose contact custom data as columns in case detail …

2 years agoMerge pull request #24140 from eileenmcnaughton/invoice_test
Matthew Wire [Thu, 4 Aug 2022 09:30:24 +0000 (10:30 +0100)]
Merge pull request #24140 from eileenmcnaughton/invoice_test

Remove `loadAll` parameter from loadRelatedObjects

2 years ago(dev/core#3768) expose contact custom data as columns in case detail report
yashodha [Thu, 4 Aug 2022 08:23:58 +0000 (13:53 +0530)]
(dev/core#3768) expose contact custom data as columns in case detail report

2 years agoMerge pull request #24150 from totten/master-group
Eileen McNaughton [Thu, 4 Aug 2022 06:50:56 +0000 (18:50 +1200)]
Merge pull request #24150 from totten/master-group

(NFC) Add common `@group` for import-related tests

2 years agoMerge pull request #24139 from eileenmcnaughton/var
Seamus Lee [Thu, 4 Aug 2022 05:06:28 +0000 (15:06 +1000)]
Merge pull request #24139 from eileenmcnaughton/var

NFC - remove unused variables, minor tidy up

2 years ago(NFC) Add common `@group` for import-related tests
Tim Otten [Thu, 4 Aug 2022 04:35:22 +0000 (21:35 -0700)]
(NFC) Add common `@group` for import-related tests

2 years agoMerge pull request #24148 from civicrm/5.52
Seamus Lee [Thu, 4 Aug 2022 04:02:59 +0000 (14:02 +1000)]
Merge pull request #24148 from civicrm/5.52

5.52

2 years agoMerge pull request #24147 from totten/5.52-notes
Seamus Lee [Thu, 4 Aug 2022 04:00:48 +0000 (14:00 +1000)]
Merge pull request #24147 from totten/5.52-notes

Add new PR to release-notes/5.52.0.md

2 years agoMerge pull request #24144 from seamuslee001/dev_core_3774
Seamus Lee [Thu, 4 Aug 2022 04:00:03 +0000 (14:00 +1000)]
Merge pull request #24144 from seamuslee001/dev_core_3774

dev/core#3774 Ensure that if we are in live credit card mode that the…

2 years agoMerge pull request #24141 from demeritcowboy/skip-event
Eileen McNaughton [Thu, 4 Aug 2022 03:56:52 +0000 (15:56 +1200)]
Merge pull request #24141 from demeritcowboy/skip-event

Skip warning about event-online message template during upgrade

2 years agoAdd new PR to release-notes/5.52.0.md
Tim Otten [Thu, 4 Aug 2022 01:41:48 +0000 (18:41 -0700)]
Add new PR to release-notes/5.52.0.md

2 years agodev/core#3774 Ensure that if we are in live credit card mode that the receive date...
Seamus Lee [Thu, 4 Aug 2022 01:10:54 +0000 (11:10 +1000)]
dev/core#3774 Ensure that if we are in live credit card mode that the receive date field is a non required field

2 years agoskip problematic template
demeritcowboy [Thu, 4 Aug 2022 00:33:17 +0000 (20:33 -0400)]
skip problematic template

2 years agoMerge pull request #24135 from eileenmcnaughton/cont_status
Seamus Lee [Thu, 4 Aug 2022 00:25:30 +0000 (10:25 +1000)]
Merge pull request #24135 from eileenmcnaughton/cont_status

Fix test to not use Contribution option group for ContributionRecur status

2 years agoMerge pull request #23725 from colemanw/oAuth
colemanw [Thu, 4 Aug 2022 00:23:41 +0000 (20:23 -0400)]
Merge pull request #23725 from colemanw/oAuth

[REF] OAuth - Move some API code to the BAO for better reusability

2 years agoRemove loadAll parameter from loadRelatedObjects
Eileen McNaughton [Wed, 3 Aug 2022 23:57:12 +0000 (11:57 +1200)]
Remove loadAll parameter from loadRelatedObjects

2 years agoMerge pull request #24138 from agh1/5.52.0-releasenotes-final
Tim Otten [Wed, 3 Aug 2022 23:39:38 +0000 (16:39 -0700)]
Merge pull request #24138 from agh1/5.52.0-releasenotes-final

5.52.0 release notes: added late changes

2 years agoNFC - remove unused variables
Eileen McNaughton [Mon, 1 Aug 2022 01:05:46 +0000 (11:05 +1000)]
NFC - remove unused variables

2 years agoUpdate 5.52.0.md
Tim Otten [Wed, 3 Aug 2022 23:28:35 +0000 (16:28 -0700)]
Update 5.52.0.md

2 years ago5.52.0 release notes: added late changes
Andie Hunt [Wed, 3 Aug 2022 23:14:12 +0000 (19:14 -0400)]
5.52.0 release notes: added late changes

2 years agoMerge pull request #24101 from eileenmcnaughton/msg
Eileen McNaughton [Wed, 3 Aug 2022 22:37:57 +0000 (10:37 +1200)]
Merge pull request #24101 from eileenmcnaughton/msg

Add upgrade for contribution offline receipt

2 years agoMerge pull request #24049 from pradpnayak/pdfformat
Eileen McNaughton [Wed, 3 Aug 2022 22:24:24 +0000 (10:24 +1200)]
Merge pull request #24049 from pradpnayak/pdfformat

define format at one place

2 years agoFix test to not use Contribution option group for ContributionRecur status
Eileen McNaughton [Wed, 3 Aug 2022 21:55:27 +0000 (09:55 +1200)]
Fix test to not use Contribution option group for ContributionRecur status

2 years agoMerge pull request #24051 from eileenmcnaughton/workflow
Monish Deb [Wed, 3 Aug 2022 03:29:43 +0000 (08:59 +0530)]
Merge pull request #24051 from eileenmcnaughton/workflow

dev/financial#201 Fix pledge payment not to refer to contribution status

2 years agoMerge pull request #24128 from eileenmcnaughton/greeting
Seamus Lee [Wed, 3 Aug 2022 01:53:57 +0000 (11:53 +1000)]
Merge pull request #24128 from eileenmcnaughton/greeting

Remove unused variable

2 years agoRemove unused variable
Eileen McNaughton [Tue, 2 Aug 2022 23:25:26 +0000 (11:25 +1200)]
Remove unused variable

2 years agoMerge pull request #24124 from bugfolder/3772_notice_in_batch_php
Eileen McNaughton [Tue, 2 Aug 2022 23:14:44 +0000 (11:14 +1200)]
Merge pull request #24124 from bugfolder/3772_notice_in_batch_php

Issue #3772: Fix undefined index notice.

2 years agoMerge pull request #24088 from eileenmcnaughton/base
Eileen McNaughton [Tue, 2 Aug 2022 22:03:58 +0000 (10:03 +1200)]
Merge pull request #24088 from eileenmcnaughton/base

Remove deprecated call to `loadRelatedObjects`

2 years agoIssue #3772: Fix undefined index notice.
Robert J. Lang [Tue, 2 Aug 2022 20:19:05 +0000 (13:19 -0700)]
Issue #3772: Fix undefined index notice.

2 years agoRemove deprecated call to
Eileen McNaughton [Fri, 29 Jul 2022 09:39:34 +0000 (10:39 +0100)]
Remove deprecated call to

2 years agoMerge pull request #24118 from eileenmcnaughton/cont_balance
Matthew Wire [Tue, 2 Aug 2022 17:18:54 +0000 (18:18 +0100)]
Merge pull request #24118 from eileenmcnaughton/cont_balance

Add `paid_amount `, `balance_amount`, `tax_exclusive_amount` available to apiv4

2 years agoMerge pull request #24087 from eileenmcnaughton/complete
Matthew Wire [Tue, 2 Aug 2022 17:09:19 +0000 (18:09 +0100)]
Merge pull request #24087 from eileenmcnaughton/complete

Remove call to `loadRelatedObjects` from `completetransaction`

2 years agoMerge pull request #24062 from eileenmcnaughton/api_query
colemanw [Tue, 2 Aug 2022 14:47:03 +0000 (10:47 -0400)]
Merge pull request #24062 from eileenmcnaughton/api_query

Remove legacy `apiquery` call from `isContactInGroup`

2 years agoMerge pull request #24120 from yashodha/reports_improvements
Seamus Lee [Tue, 2 Aug 2022 07:56:13 +0000 (17:56 +1000)]
Merge pull request #24120 from yashodha/reports_improvements

add filter for 'Activity type of the last activity' for case detail r…

2 years agoMerge pull request #24119 from eileenmcnaughton/asql
Seamus Lee [Tue, 2 Aug 2022 07:25:21 +0000 (17:25 +1000)]
Merge pull request #24119 from eileenmcnaughton/asql

Regenerate sql

2 years agoAdd paid_amount, balance_amount, tax_exclusive_amount to apiv4
Eileen McNaughton [Wed, 15 Jun 2022 05:33:42 +0000 (17:33 +1200)]
Add paid_amount, balance_amount, tax_exclusive_amount to apiv4

2 years agoMerge pull request #24063 from eileenmcnaughton/msg_breakdown
Eileen McNaughton [Tue, 2 Aug 2022 05:33:58 +0000 (15:33 +1000)]
Merge pull request #24063 from eileenmcnaughton/msg_breakdown

Move hook_civicrm_translateFields from message_admin to core

2 years agoadd filter for 'Activity type of the last activity' for case detail report
yashodha [Tue, 2 Aug 2022 04:50:30 +0000 (10:20 +0530)]
add filter for 'Activity type of the last activity' for case detail report

2 years agoRegenerate sql
Eileen McNaughton [Tue, 2 Aug 2022 04:18:00 +0000 (16:18 +1200)]
Regenerate sql

2 years agoMerge pull request #24113 from eileenmcnaughton/inv_close
Seamus Lee [Tue, 2 Aug 2022 04:13:46 +0000 (14:13 +1000)]
Merge pull request #24113 from eileenmcnaughton/inv_close

Whitespace cleanup  in invoice template

2 years agoMake type strict
Eileen McNaughton [Sun, 31 Jul 2022 19:59:32 +0000 (05:59 +1000)]
Make type strict

2 years agoFix test passing array instead of id
Eileen McNaughton [Sun, 31 Jul 2022 19:59:13 +0000 (05:59 +1000)]
Fix test passing array instead of id

2 years agoRemove call to loadRelatedObjects from completetransaction
Eileen McNaughton [Fri, 29 Jul 2022 09:31:59 +0000 (10:31 +0100)]
Remove call to loadRelatedObjects from completetransaction

2 years agoRemove legacy apiquery call from 'isContactInGroup'
Eileen McNaughton [Wed, 27 Jul 2022 14:45:46 +0000 (15:45 +0100)]
Remove legacy apiquery call from 'isContactInGroup'

2 years agoFix conformance to the right entity....
Eileen McNaughton [Mon, 1 Aug 2022 23:57:16 +0000 (11:57 +1200)]
Fix conformance to the right entity....

2 years agoCleanup test, ensure events are declared as translatable for test
Eileen McNaughton [Wed, 27 Jul 2022 15:49:04 +0000 (16:49 +0100)]
Cleanup test, ensure events are declared as translatable for test

This test should not have been passing prior to this... it needed the event fields declared as translatable
but we got away with it until we didn't

2 years agoMove hook_civicrm_translateFields from message_admin to core
Eileen McNaughton [Tue, 28 Jun 2022 04:29:04 +0000 (21:29 -0700)]
Move hook_civicrm_translateFields from message_admin to core

2 years agoMerge pull request #24114 from eileenmcnaughton/static
colemanw [Tue, 2 Aug 2022 01:33:16 +0000 (21:33 -0400)]
Merge pull request #24114 from eileenmcnaughton/static

Call static function statically

2 years agoMerge pull request #24082 from seamuslee001/php81_batch_5
Eileen McNaughton [Tue, 2 Aug 2022 01:20:34 +0000 (11:20 +1000)]
Merge pull request #24082 from seamuslee001/php81_batch_5

[REF][PHP8.1] Another batch of fixes for passing in NULL values into …

2 years agoMerge pull request #24117 from civicrm/5.52
Eileen McNaughton [Tue, 2 Aug 2022 01:17:51 +0000 (11:17 +1000)]
Merge pull request #24117 from civicrm/5.52

5.52 to master

2 years agoMerge pull request #24071 from eileenmcnaughton/conf
Seamus Lee [Tue, 2 Aug 2022 01:17:35 +0000 (11:17 +1000)]
Merge pull request #24071 from eileenmcnaughton/conf

Minor test cleanup

2 years agoMerge pull request #24115 from kcristiano/5.52-token
Eileen McNaughton [Tue, 2 Aug 2022 01:17:28 +0000 (11:17 +1000)]
Merge pull request #24115 from kcristiano/5.52-token

membership tokens don't always work

2 years agoMerge pull request #24098 from seamuslee001/dev_core_3766
Seamus Lee [Mon, 1 Aug 2022 23:59:18 +0000 (09:59 +1000)]
Merge pull request #24098 from seamuslee001/dev_core_3766

dev/core#3766 Keep league/csv on 9.6 for D9 as well so patches can apply

2 years agoMerge pull request #24022 from colemanw/afformFrontend
Seamus Lee [Mon, 1 Aug 2022 23:11:27 +0000 (09:11 +1000)]
Merge pull request #24022 from colemanw/afformFrontend

Afform - Check is_public directly

2 years agoWhitespace cleanup
Eileen McNaughton [Mon, 1 Aug 2022 19:30:53 +0000 (05:30 +1000)]
Whitespace cleanup

2 years agoMerge pull request #24105 from eileenmcnaughton/priv
Seamus Lee [Mon, 1 Aug 2022 21:02:31 +0000 (07:02 +1000)]
Merge pull request #24105 from eileenmcnaughton/priv

Make unshared function private, remove unused return

2 years ago[REF][PHP8.1] Another batch of fixes for passing in NULL values into functions that...
Seamus Lee [Thu, 28 Jul 2022 21:41:45 +0000 (07:41 +1000)]
[REF][PHP8.1] Another batch of fixes for passing in NULL values into functions that expect string|array parameters

2 years agomembership tokens don't always work
kevin Cristiano [Mon, 1 Aug 2022 17:35:45 +0000 (13:35 -0400)]
membership tokens don't always work

https://github.com/eileenmcnaughton/nz.co.fuzion.civitoken/issues/52

2 years agoCall static function statically
Eileen McNaughton [Mon, 1 Aug 2022 20:05:14 +0000 (06:05 +1000)]
Call static function statically

2 years agoMerge pull request #24111 from demeritcowboy/invoice-message-tpl
Eileen McNaughton [Mon, 1 Aug 2022 19:10:58 +0000 (05:10 +1000)]
Merge pull request #24111 from demeritcowboy/invoice-message-tpl

Fix and followups for invoice receipt message template

2 years agofix junk
demeritcowboy [Mon, 1 Aug 2022 15:02:10 +0000 (11:02 -0400)]
fix junk

2 years agoMerge pull request #24108 from eileenmcnaughton/inv_close
colemanw [Mon, 1 Aug 2022 14:57:34 +0000 (10:57 -0400)]
Merge pull request #24108 from eileenmcnaughton/inv_close

Remove extraneous closing tags

2 years agoMerge pull request #24109 from yashodha/reports_improvements
demeritcowboy [Mon, 1 Aug 2022 13:26:50 +0000 (09:26 -0400)]
Merge pull request #24109 from yashodha/reports_improvements

expose city in case detail report

2 years agoMerge pull request #24107 from eileenmcnaughton/fixme
demeritcowboy [Mon, 1 Aug 2022 13:22:33 +0000 (09:22 -0400)]
Merge pull request #24107 from eileenmcnaughton/fixme

Remove some fixmes from message tpls

2 years agoMerge pull request #24106 from eileenmcnaughton/offline
demeritcowboy [Mon, 1 Aug 2022 13:18:25 +0000 (09:18 -0400)]
Merge pull request #24106 from eileenmcnaughton/offline

Remove extra space, offline receipt

2 years agoexpose city in case detail report
yashodha [Mon, 1 Aug 2022 06:46:36 +0000 (12:16 +0530)]
expose city in case detail report

2 years agoRemove extraneous closing tags
Eileen McNaughton [Mon, 1 Aug 2022 06:20:04 +0000 (16:20 +1000)]
Remove extraneous closing tags

2 years agoRemove some fixmes from message tpls
Eileen McNaughton [Mon, 1 Aug 2022 06:09:41 +0000 (16:09 +1000)]
Remove some fixmes from message tpls

2 years agoRemove extra space, offline receipt
Eileen McNaughton [Mon, 1 Aug 2022 06:06:32 +0000 (16:06 +1000)]
Remove extra space, offline receipt

2 years agoMerge pull request #24099 from colemanw/api4options
Eileen McNaughton [Mon, 1 Aug 2022 06:01:54 +0000 (16:01 +1000)]
Merge pull request #24099 from colemanw/api4options

APIv4 - Improve pseudoconstant support in getFields

2 years agoAdded default invoice pdf format
Pradeep Nayak [Fri, 29 Jul 2022 18:16:11 +0000 (19:16 +0100)]
Added default invoice pdf format

2 years agoMake unshared function private, remove unused return
Eileen McNaughton [Mon, 1 Aug 2022 01:04:21 +0000 (11:04 +1000)]
Make unshared function private, remove unused return

2 years agoAdd upgrade for contribution offline receipt
Eileen McNaughton [Sun, 31 Jul 2022 20:05:10 +0000 (06:05 +1000)]
Add upgrade for contribution offline receipt

2 years agoMerge pull request #24100 from seamuslee001/fix_date_format
demeritcowboy [Sun, 31 Jul 2022 17:16:50 +0000 (13:16 -0400)]
Merge pull request #24100 from seamuslee001/fix_date_format

[REF] Fix Test fails on import by ensuring that Month Abbreviations a…

2 years agoAPIv4 - smarter parsing of Entity docblocks
Coleman Watts [Sun, 31 Jul 2022 14:51:45 +0000 (10:51 -0400)]
APIv4 - smarter parsing of Entity docblocks

2 years agoAPIv4 - Improve pseudoconstant support in getFields
Coleman Watts [Sun, 31 Jul 2022 01:41:17 +0000 (21:41 -0400)]
APIv4 - Improve pseudoconstant support in getFields

This allows APIv4 getFields arrays to specify a pseudoconstant key which is
automatically transformed into an array of options in the right format.

2 years ago[REF] Fix Test fails on import by ensuring that Month Abberviations are formatted...
Seamus Lee [Sun, 31 Jul 2022 10:38:18 +0000 (20:38 +1000)]
[REF] Fix Test fails on import by ensuring that Month Abberviations are formatted based on the first of each month

2 years agoMerge pull request #24096 from demeritcowboy/guzmock2
Seamus Lee [Sun, 31 Jul 2022 01:37:20 +0000 (11:37 +1000)]
Merge pull request #24096 from demeritcowboy/guzmock2

Fix grep in guzzle mock patch

2 years agoMerge pull request #24095 from civicrm/5.52
Seamus Lee [Sun, 31 Jul 2022 01:06:54 +0000 (11:06 +1000)]
Merge pull request #24095 from civicrm/5.52

5.52

2 years agoMerge pull request #24097 from seamuslee001/test_d9
Seamus Lee [Sun, 31 Jul 2022 00:50:54 +0000 (10:50 +1000)]
Merge pull request #24097 from seamuslee001/test_d9

dev/core#3765 Ensure that CiviCRM's Guzzle shim does not conflict with Drupal's guzzle shim

2 years agodev/core#3766 Keep league/csv on 9.6 for D9 as well so patches can apply
Seamus Lee [Sat, 30 Jul 2022 23:13:45 +0000 (23:13 +0000)]
dev/core#3766 Keep league/csv on 9.6 for D9 as well so patches can apply

2 years agoWIP: Try and fix installing on d9
Seamus Lee [Sat, 30 Jul 2022 22:56:22 +0000 (22:56 +0000)]
WIP: Try and fix installing on d9

2 years agooops - previously adjusted spacing breaks the grep
demeritcowboy [Sat, 30 Jul 2022 22:56:22 +0000 (18:56 -0400)]
oops - previously adjusted spacing breaks the grep

2 years agoMerge pull request #24094 from demeritcowboy/guzmock
Seamus Lee [Sat, 30 Jul 2022 22:49:26 +0000 (08:49 +1000)]
Merge pull request #24094 from demeritcowboy/guzmock

Fix regex on windows

2 years agoMerge pull request #24081 from seamuslee001/php81_trait
demeritcowboy [Sat, 30 Jul 2022 14:17:27 +0000 (10:17 -0400)]
Merge pull request #24081 from seamuslee001/php81_trait

[NFC][PHP8.1] Ensure that Trait function is only accessed by classes …

2 years agoMerge pull request #24083 from seamuslee001/php81_page_singlequotes
demeritcowboy [Sat, 30 Jul 2022 13:57:04 +0000 (09:57 -0400)]
Merge pull request #24083 from seamuslee001/php81_page_singlequotes

[REF][PHP8.1] Permit single quotes within html attributes

2 years agoMerge pull request #24067 from twomice/3756_hook_civicrm_geocoderFormat
colemanw [Sat, 30 Jul 2022 13:29:49 +0000 (09:29 -0400)]
Merge pull request #24067 from twomice/3756_hook_civicrm_geocoderFormat

Fix #3756 hook_civicrm_geocoderFormat does not alter address components

2 years agofix regex on windows
demeritcowboy [Sat, 30 Jul 2022 12:56:07 +0000 (08:56 -0400)]
fix regex on windows

2 years agoMerge pull request #24092 from seamuslee001/php81_ini_deprecation
Eileen McNaughton [Sat, 30 Jul 2022 10:17:55 +0000 (11:17 +0100)]
Merge pull request #24092 from seamuslee001/php81_ini_deprecation

[REF][PHP8.1] Do not set auto_detect_line_endings to true on php vers…

2 years agoMerge pull request #24093 from seamuslee001/php81_phpword
Eileen McNaughton [Sat, 30 Jul 2022 10:16:56 +0000 (11:16 +0100)]
Merge pull request #24093 from seamuslee001/php81_phpword

[REF][PHP8.1] Apply patch in PHPWord to fix passing in null value into strlen in validating locale

2 years agoMinor test cleanup
Eileen McNaughton [Thu, 28 Jul 2022 09:18:28 +0000 (10:18 +0100)]
Minor test cleanup

2 years ago[REF][PHP8.1] Apply patch in PHPWord to fix passing in null value into stlen in valid...
Seamus Lee [Sat, 30 Jul 2022 07:35:40 +0000 (17:35 +1000)]
[REF][PHP8.1] Apply patch in PHPWord to fix passing in null value into stlen in validating locale

2 years ago[REF][PHP8.1] Do not set auto_detect_line_endings to true on php versions 8.1 and...
Seamus Lee [Sat, 30 Jul 2022 04:34:05 +0000 (14:34 +1000)]
[REF][PHP8.1] Do not set auto_detect_line_endings to true on php versions 8.1 and later as it is deprecated

2 years agoMerge pull request #24091 from seamuslee001/phpunit_warning_fix
Seamus Lee [Sat, 30 Jul 2022 01:34:24 +0000 (11:34 +1000)]
Merge pull request #24091 from seamuslee001/phpunit_warning_fix

[NFC] Resolve phpunit warning about using assertContains on strings

2 years ago[NFC] Resolve phpunit warning about using assertContains on strings
Seamus Lee [Fri, 29 Jul 2022 22:53:49 +0000 (08:53 +1000)]
[NFC] Resolve phpunit warning about using assertContains on strings