civicrm-core.git
2 years agoMerge pull request #23138 from eileenmcnaughton/map
colemanw [Fri, 8 Apr 2022 12:37:25 +0000 (08:37 -0400)]
Merge pull request #23138 from eileenmcnaughton/map

Consolidate MapTable.tpl

2 years agoMerge pull request #23136 from eileenmcnaughton/notice_mem_search
Yashodha Chaku [Fri, 8 Apr 2022 07:13:37 +0000 (12:43 +0530)]
Merge pull request #23136 from eileenmcnaughton/notice_mem_search

Enotice fix - membership search

2 years agoMerge pull request #23137 from eileenmcnaughton/unused
Yashodha Chaku [Fri, 8 Apr 2022 07:09:55 +0000 (12:39 +0530)]
Merge pull request #23137 from eileenmcnaughton/unused

Remove unused property

2 years agoConsolidate MapTable.tpl
Eileen McNaughton [Fri, 8 Apr 2022 04:43:07 +0000 (16:43 +1200)]
Consolidate MapTable.tpl

2 years agoRemove unused property
Eileen McNaughton [Fri, 8 Apr 2022 04:26:31 +0000 (16:26 +1200)]
Remove unused property

2 years agoEnotice fix - membership search
Eileen McNaughton [Fri, 8 Apr 2022 03:30:49 +0000 (15:30 +1200)]
Enotice fix - membership search

2 years agoMerge pull request #23134 from totten/master-buggable
demeritcowboy [Fri, 8 Apr 2022 02:55:05 +0000 (22:55 -0400)]
Merge pull request #23134 from totten/master-buggable

(REF) Schema - Fix boolean fields in various tables - Split commits

2 years agoMerge pull request #23133 from eileenmcnaughton/mem
demeritcowboy [Fri, 8 Apr 2022 02:51:08 +0000 (22:51 -0400)]
Merge pull request #23133 from eileenmcnaughton/mem

Remove 'in-between' class

2 years agoMerge pull request #23129 from colemanw/api4_log_entity
demeritcowboy [Fri, 8 Apr 2022 02:50:47 +0000 (22:50 -0400)]
Merge pull request #23129 from colemanw/api4_log_entity

Add in APIv4 Logging Entity

2 years agoSchema - Boolean blob
Monish Deb [Fri, 8 Apr 2022 01:12:18 +0000 (18:12 -0700)]
Schema - Boolean blob

2 years agoSchema - Fix boolean fields in 'SMS'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'SMS'

2 years agoSchema - Fix boolean fields in 'Report'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Report'

2 years agoSchema - Fix boolean fields in 'Pledge'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Pledge'

2 years agoSchema - Fix boolean fields in 'Price'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Price'

2 years agoSchema - Fix boolean fields in 'PCP'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'PCP'

2 years agoSchema - Fix boolean fields in 'Member'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Member'

2 years agoSchema - Fix boolean fields in 'Mailing'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Mailing'

2 years agoSchema - Fix boolean fields in 'Friend'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Friend'

2 years agoSchema - Fix boolean fields in 'Financial'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Financial'

2 years agoSchema - Fix boolean fields in 'Event'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Event'

2 years agoSchema - Fix boolean fields in 'Dedupe'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Dedupe'

2 years agoSchema - Fix boolean fields in 'Cxn'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Cxn'

2 years agoSchema - Fix boolean fields in 'Core'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Core'

2 years agoSchema - Fix boolean fields in 'Contribute'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Contribute'

2 years agoSchema - Fix boolean fields in 'Contact'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Contact'

2 years agoSchema - Fix boolean fields in 'Case'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Case'

2 years agoSchema - Fix boolean fields in 'Campaign'
Monish Deb [Fri, 8 Apr 2022 01:12:15 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Campaign'

2 years agoSchema - Fix boolean fields in 'Activity'
Monish Deb [Fri, 8 Apr 2022 01:12:15 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Activity'

2 years agoSchema - Fix boolean fields in 'ACL'
Monish Deb [Fri, 8 Apr 2022 01:12:15 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'ACL'

2 years agoSchema - Add base function for FiveFortyNine boolean search
Tim Otten [Fri, 8 Apr 2022 01:12:15 +0000 (18:12 -0700)]
Schema - Add base function for FiveFortyNine boolean search

2 years agoRevert "Schema - Fix boolean fields in various tables"
Tim Otten [Fri, 8 Apr 2022 01:06:52 +0000 (18:06 -0700)]
Revert "Schema - Fix boolean fields in various tables"

This reverts commit c1e814c7ddd3406dbada69de369e07b1eb85c689.

2 years agoAdd in APIv4 Logging Entity
Monish Deb [Tue, 23 Nov 2021 12:32:32 +0000 (18:02 +0530)]
Add in APIv4 Logging Entity

2 years agoRemove 'in-between' class
Eileen McNaughton [Fri, 8 Apr 2022 00:05:41 +0000 (12:05 +1200)]
Remove 'in-between' class

2 years agoMerge pull request #23130 from colemanw/managedOptionValue
Seamus Lee [Thu, 7 Apr 2022 21:12:48 +0000 (07:12 +1000)]
Merge pull request #23130 from colemanw/managedOptionValue

Fix OptionValue BAO to call pre/post hooks to prevent force-reset of managed option values

2 years agoFix OptionValue BAO to call pre/post hooks to prevent force-reset of managed entities
Coleman Watts [Thu, 7 Apr 2022 19:40:30 +0000 (15:40 -0400)]
Fix OptionValue BAO to call pre/post hooks to prevent force-reset of managed entities

Managed entities rely on pre/post hooks being called in order to track whether an entity
has been modified. Without those hooks OptionValues were being force-reverted by the
managed system even when the 'update' mode was set to 'unmodified', which is supposed
to defer to user modifications.

2 years agoMerge pull request #22850 from ixiam/dev_Issue#3080
colemanw [Thu, 7 Apr 2022 18:51:53 +0000 (14:51 -0400)]
Merge pull request #22850 from ixiam/dev_Issue#3080

Fixes issue with duplicate is_billing on inline address forms.

2 years agoFixes style warnings
Vangelis Pantazis [Thu, 7 Apr 2022 14:07:25 +0000 (15:07 +0100)]
Fixes style warnings

2 years agoMerge pull request #22941 from sunilpawar/batch_copy_radio_clear_value
colemanw [Thu, 7 Apr 2022 13:48:05 +0000 (09:48 -0400)]
Merge pull request #22941 from sunilpawar/batch_copy_radio_clear_value

Copy Clear value in batch update process for radio button field

2 years agoMerge pull request #20437 from JMAConsulting/core_2633
colemanw [Thu, 7 Apr 2022 13:43:27 +0000 (09:43 -0400)]
Merge pull request #20437 from JMAConsulting/core_2633

core#2633 : Cannot remove Group Organisation selection in multisite setup

2 years agoMerge pull request #22954 from JMAConsulting/booleanFields
colemanw [Thu, 7 Apr 2022 13:31:17 +0000 (09:31 -0400)]
Merge pull request #22954 from JMAConsulting/booleanFields

[WIP] Schema - Fix boolean fields in various tables

2 years agoSchema - Fix boolean fields in various tables
Monish Deb [Wed, 16 Mar 2022 11:22:59 +0000 (16:52 +0530)]
Schema - Fix boolean fields in various tables

2 years agoMerge pull request #23126 from eileenmcnaughton/imp
Yashodha Chaku [Thu, 7 Apr 2022 05:28:14 +0000 (10:58 +0530)]
Merge pull request #23126 from eileenmcnaughton/imp

Remove good intentions

2 years agoMerge pull request #23127 from civicrm/5.48
Seamus Lee [Thu, 7 Apr 2022 05:10:49 +0000 (15:10 +1000)]
Merge pull request #23127 from civicrm/5.48

5.48

2 years agoMerge pull request #23125 from agh1/5.48.0-releasenotes-final
Tim Otten [Thu, 7 Apr 2022 05:08:22 +0000 (22:08 -0700)]
Merge pull request #23125 from agh1/5.48.0-releasenotes-final

5.48.0 release notes: added late changes

2 years agoRemove good intentions
Eileen McNaughton [Thu, 7 Apr 2022 02:25:55 +0000 (14:25 +1200)]
Remove good intentions

No - this isn't a todo we are about to do all of a sudden....

2 years ago5.48.0 release notes: added late changes
Andie Hunt [Thu, 7 Apr 2022 02:17:01 +0000 (22:17 -0400)]
5.48.0 release notes: added late changes

2 years agoMerge pull request #23124 from eileenmcnaughton/html
Seamus Lee [Thu, 7 Apr 2022 02:06:05 +0000 (12:06 +1000)]
Merge pull request #23124 from eileenmcnaughton/html

Tpl cleanup - whitespace, wrong closing tag

2 years agoMerge pull request #23121 from eileenmcnaughton/imp
colemanw [Thu, 7 Apr 2022 01:47:13 +0000 (21:47 -0400)]
Merge pull request #23121 from eileenmcnaughton/imp

Simplify class inheritance

2 years agoMerge branch '5.48' to master
Coleman Watts [Thu, 7 Apr 2022 01:07:19 +0000 (21:07 -0400)]
Merge branch '5.48' to master

2 years agoMerge pull request #22977 from eileenmcnaughton/issetit
colemanw [Thu, 7 Apr 2022 01:03:58 +0000 (21:03 -0400)]
Merge pull request #22977 from eileenmcnaughton/issetit

Ensure pay_later_text is always assigned

2 years agoMerge pull request #23123 from eileenmcnaughton/private
colemanw [Thu, 7 Apr 2022 00:52:17 +0000 (20:52 -0400)]
Merge pull request #23123 from eileenmcnaughton/private

Remove unused private variables

2 years agoMerge pull request #23122 from eileenmcnaughton/rr
Eileen McNaughton [Thu, 7 Apr 2022 00:36:43 +0000 (12:36 +1200)]
Merge pull request #23122 from eileenmcnaughton/rr

Fix function calls to be non-static

2 years agoMerge pull request #23016 from pradpnayak/optionValue
colemanw [Thu, 7 Apr 2022 00:26:09 +0000 (20:26 -0400)]
Merge pull request #23016 from pradpnayak/optionValue

Respect zero value

2 years agoMerge pull request #23120 from colemanw/contentBlock2
colemanw [Thu, 7 Apr 2022 00:24:28 +0000 (20:24 -0400)]
Merge pull request #23120 from colemanw/contentBlock2

Afform - Ensure upgrade fully converts content blocks

2 years agoTpl cleanup - whitespace, wrong closing tag
Eileen McNaughton [Thu, 7 Apr 2022 00:22:59 +0000 (12:22 +1200)]
Tpl cleanup - whitespace, wrong closing tag

2 years agoMerge pull request #23119 from eileenmcnaughton/silly6
colemanw [Thu, 7 Apr 2022 00:07:34 +0000 (20:07 -0400)]
Merge pull request #23119 from eileenmcnaughton/silly6

Notices on import - consolidate mapping variables

2 years agoMerge pull request #23116 from colemanw/removeContactViewOptions
Eileen McNaughton [Wed, 6 Apr 2022 23:15:34 +0000 (11:15 +1200)]
Merge pull request #23116 from colemanw/removeContactViewOptions

CiviGrant - Remove upgrade that adds removed option value

2 years agoSimplify class inheritance
Eileen McNaughton [Wed, 6 Apr 2022 22:39:09 +0000 (10:39 +1200)]
Simplify class inheritance

CRM_Contribute_Import_Parser_Contribution is the only class in our universe to
extend CRM_Contribute_Import_Parser and this class only adds confusion to the
mix as functions are 'distributed' between them. This removes the inheritance,
leaving only the constant that is still used in the now-deprecated class

2 years agoMerge pull request #23117 from colemanw/shorcuts
colemanw [Wed, 6 Apr 2022 23:14:23 +0000 (19:14 -0400)]
Merge pull request #23117 from colemanw/shorcuts

Emit deprecated warning for typo version of hook_civicrm_links

2 years agoMerge pull request #23099 from colemanw/RecentItemAPI
colemanw [Wed, 6 Apr 2022 22:56:34 +0000 (18:56 -0400)]
Merge pull request #23099 from colemanw/RecentItemAPI

Add APIv4 for RecentItems

2 years agoRemove unused private variables
Eileen McNaughton [Wed, 6 Apr 2022 22:53:52 +0000 (10:53 +1200)]
Remove unused private variables

2 years agoMerge pull request #23118 from colemanw/grantTab
colemanw [Wed, 6 Apr 2022 22:55:58 +0000 (18:55 -0400)]
Merge pull request #23118 from colemanw/grantTab

CiviGrant - Fix missing column and translate headers in contact summary tab

2 years agoFix function calls to be non-static
Eileen McNaughton [Wed, 6 Apr 2022 22:47:54 +0000 (10:47 +1200)]
Fix function calls to be non-static

2 years agoMerge pull request #23115 from eileenmcnaughton/548
Eileen McNaughton [Wed, 6 Apr 2022 22:30:10 +0000 (10:30 +1200)]
Merge pull request #23115 from eileenmcnaughton/548

Fix broken civgrant shortcut link

2 years agoAfform - Ensure upgrade fully converts content blocks
Coleman Watts [Wed, 6 Apr 2022 22:21:02 +0000 (18:21 -0400)]
Afform - Ensure upgrade fully converts content blocks

Ensures `{block: '*'}` doesn't get converted to `{entity_type: '*'}`
because that's not a real entity type.

2 years agoMerge pull request #23104 from colemanw/contentBlock
Eileen McNaughton [Wed, 6 Apr 2022 22:13:55 +0000 (10:13 +1200)]
Merge pull request #23104 from colemanw/contentBlock

Afform - Fix regression editing a content block with no entity type

2 years agoNotices on import - consolidate mapping variables
Eileen McNaughton [Wed, 6 Apr 2022 19:59:04 +0000 (07:59 +1200)]
Notices on import - consolidate mapping variables

This consolidates 2 variables mappingName and loadedMapping into
one (savedMappingName) - loadedMapping is only ever used as
a boolean so presence or otherwise of savedMappingName is enough.

This addresses enotices and simplifies the code

2 years agoMerge pull request #23114 from eileenmcnaughton/silly6
colemanw [Wed, 6 Apr 2022 18:39:59 +0000 (14:39 -0400)]
Merge pull request #23114 from eileenmcnaughton/silly6

Fix enotice, simplify text on Saved field mapping

2 years agoAdds PHPUnit testing for multiple addresses with is_billing on
Vangelis Pantazis [Wed, 6 Apr 2022 17:09:13 +0000 (18:09 +0100)]
Adds PHPUnit testing for multiple addresses with is_billing on

2 years agoCiviGrant - Fix missing column and translated headers in contact summary tab
Coleman Watts [Wed, 6 Apr 2022 16:06:16 +0000 (12:06 -0400)]
CiviGrant - Fix missing column and translated headers in contact summary tab

2 years agoCiviGrant - Refresh grants tab after adding a grant from contact summary actions...
Coleman Watts [Wed, 6 Apr 2022 15:55:05 +0000 (11:55 -0400)]
CiviGrant - Refresh grants tab after adding a grant from contact summary actions menu

2 years agoFix contact summary actions for CiviGrant
Coleman Watts [Wed, 6 Apr 2022 15:27:46 +0000 (11:27 -0400)]
Fix contact summary actions for CiviGrant

2 years agoFix broken civgrant shortcut link
Eileen McNaughton [Wed, 6 Apr 2022 06:03:14 +0000 (18:03 +1200)]
Fix broken civgrant shortcut link

2 years agoEmit deprecated warning for typo version of hook_civicrm_links
Coleman Watts [Wed, 6 Apr 2022 13:49:57 +0000 (09:49 -0400)]
Emit deprecated warning for typo version of hook_civicrm_links

The context string 'create.new.shorcuts' was deprecated in 2018.
This adds a noisy warning to ensure extension devs update their code.

2 years agoMerge pull request #23111 from eileenmcnaughton/silly3
colemanw [Wed, 6 Apr 2022 12:08:17 +0000 (08:08 -0400)]
Merge pull request #23111 from eileenmcnaughton/silly3

Cleanup unnecessary variables

2 years agoMerge pull request #23110 from eileenmcnaughton/silly2
colemanw [Wed, 6 Apr 2022 12:07:24 +0000 (08:07 -0400)]
Merge pull request #23110 from eileenmcnaughton/silly2

Remove unnecessary pass-by-ref

2 years agoMerge pull request #23113 from eileenmcnaughton/silly5
colemanw [Wed, 6 Apr 2022 12:04:43 +0000 (08:04 -0400)]
Merge pull request #23113 from eileenmcnaughton/silly5

Remove unused variable

2 years agoMerge pull request #23112 from eileenmcnaughton/import
colemanw [Wed, 6 Apr 2022 12:04:11 +0000 (08:04 -0400)]
Merge pull request #23112 from eileenmcnaughton/import

Test cleanup (minor)

2 years agoRun gencode to populate contact type icons
Coleman Watts [Wed, 6 Apr 2022 12:02:55 +0000 (08:02 -0400)]
Run gencode to populate contact type icons

2 years agoCiviGrant - Remove upgrade that adds removed option value
Coleman Watts [Wed, 6 Apr 2022 11:48:49 +0000 (07:48 -0400)]
CiviGrant - Remove upgrade that adds removed option value

2 years agoMerge pull request #23108 from eileenmcnaughton/silly
Eileen McNaughton [Wed, 6 Apr 2022 08:39:26 +0000 (20:39 +1200)]
Merge pull request #23108 from eileenmcnaughton/silly

Remove double return statement

2 years agoFix enotice, simplify text on Saved field mapping
Eileen McNaughton [Wed, 6 Apr 2022 05:31:16 +0000 (17:31 +1200)]
Fix enotice, simplify text on Saved field mapping

2 years agoRemove unused variable
Eileen McNaughton [Wed, 6 Apr 2022 04:42:22 +0000 (16:42 +1200)]
Remove unused variable

2 years agoTest cleanup
Eileen McNaughton [Wed, 6 Apr 2022 04:39:09 +0000 (16:39 +1200)]
Test cleanup

Simplifies test set up of options & ensures they are deleted

2 years agoMerge pull request #23106 from eileenmcnaughton/import
Eileen McNaughton [Wed, 6 Apr 2022 04:31:36 +0000 (16:31 +1200)]
Merge pull request #23106 from eileenmcnaughton/import

Test cleanup, deprecate ContributionSoft::retrieve

2 years agoCleanup unnecessary variables
Eileen McNaughton [Wed, 6 Apr 2022 04:25:13 +0000 (16:25 +1200)]
Cleanup unnecessary variables

2 years agoMerge pull request #23109 from seamuslee001/master
Seamus Lee [Wed, 6 Apr 2022 04:21:41 +0000 (14:21 +1000)]
Merge pull request #23109 from seamuslee001/master

5.48

2 years agoMerge in 5.48
Seamus Lee [Wed, 6 Apr 2022 04:21:10 +0000 (14:21 +1000)]
Merge in 5.48

2 years agoRemove unnecessary pass-by-ref
Eileen McNaughton [Wed, 6 Apr 2022 04:21:05 +0000 (16:21 +1200)]
Remove unnecessary pass-by-ref

2 years agoMerge pull request #23102 from seamuslee001/dompdf_update
Seamus Lee [Wed, 6 Apr 2022 04:18:14 +0000 (14:18 +1000)]
Merge pull request #23102 from seamuslee001/dompdf_update

Update DOMPDF to 1.2.1 and update composer-compile-plugin as per master

2 years agoMerge pull request #23076 from eileenmcnaughton/cont_status
Monish Deb [Wed, 6 Apr 2022 04:17:58 +0000 (09:47 +0530)]
Merge pull request #23076 from eileenmcnaughton/cont_status

dev/financial#186 Do not display partially paid & partially refunded for selection on edit

2 years agoRemove double return statement
Eileen McNaughton [Wed, 6 Apr 2022 04:17:43 +0000 (16:17 +1200)]
Remove double return statement

2 years agoMerge pull request #23105 from colemanw/grantViewOptions
demeritcowboy [Wed, 6 Apr 2022 03:25:38 +0000 (23:25 -0400)]
Merge pull request #23105 from colemanw/grantViewOptions

CiviGrant - Remove non-functional setting for grants tab

2 years agoTest cleanup
Eileen McNaughton [Wed, 6 Apr 2022 01:43:33 +0000 (13:43 +1200)]
Test cleanup

This removes the only call to ContributionSoft::retrieve that I could
find in core, hence I added a deprecation notice to the function.

There could be some extension uses - although it would never have
been supported to call this rather than the api

2 years agoMerge pull request #23040 from eileenmcnaughton/display_opt
colemanw [Wed, 6 Apr 2022 01:47:29 +0000 (21:47 -0400)]
Merge pull request #23040 from eileenmcnaughton/display_opt

Stop passing settings into getTaxLabel

2 years agoMerge pull request #23008 from eileenmcnaughton/temp_selected
colemanw [Wed, 6 Apr 2022 01:42:38 +0000 (21:42 -0400)]
Merge pull request #23008 from eileenmcnaughton/temp_selected

Re-fix enotice on templateSelected

2 years agoCiviGrant - Remove non-functional setting for grants tab in `contact_view_options`
Coleman Watts [Wed, 6 Apr 2022 01:02:09 +0000 (21:02 -0400)]
CiviGrant - Remove non-functional setting for grants tab in `contact_view_options`

Fixes dev/core#3159

The status of the tab can be controlled at a coarse level by disabling/enabling the CiviGrant extension,
and at a finer level with the Contact Layout Editor extension, making this option unnecessary.
Since it's broken, it seemed best to remove it.

2 years agoMerge pull request #22992 from eileenmcnaughton/billingnot
colemanw [Wed, 6 Apr 2022 00:46:34 +0000 (20:46 -0400)]
Merge pull request #22992 from eileenmcnaughton/billingnot

Fix smarty notices in billing form

2 years agoMerge pull request #23039 from eileenmcnaughton/inv2
colemanw [Wed, 6 Apr 2022 00:45:22 +0000 (20:45 -0400)]
Merge pull request #23039 from eileenmcnaughton/inv2

Access invoice_prefix setting directly

2 years agoAfform - Fix regression editing a content block with no entity type
Coleman Watts [Wed, 6 Apr 2022 00:37:04 +0000 (20:37 -0400)]
Afform - Fix regression editing a content block with no entity type