civicrm-core.git
2 years agoMerge pull request #23566 from eileenmcnaughton/550
Eileen McNaughton [Tue, 24 May 2022 19:13:35 +0000 (07:13 +1200)]
Merge pull request #23566 from eileenmcnaughton/550

Calculate unit_price based on qty

2 years agoCalculate unit_price based on qty
David Reedy Jr [Tue, 17 May 2022 13:15:21 +0000 (08:15 -0500)]
Calculate unit_price based on qty

2 years agoMerge pull request #23528 from eileenmcnaughton/raw_money
Seamus Lee [Tue, 24 May 2022 02:23:01 +0000 (12:23 +1000)]
Merge pull request #23528 from eileenmcnaughton/raw_money

Fix empty money handling

2 years agoFix empty money handling
Eileen McNaughton [Fri, 20 May 2022 20:43:42 +0000 (08:43 +1200)]
Fix empty money handling

2 years agoMerge pull request #23499 from totten/master-cdesc
Tim Otten [Fri, 20 May 2022 00:04:50 +0000 (17:04 -0700)]
Merge pull request #23499 from totten/master-cdesc

(dev/core#3436) MultipleRecordFieldsListing.tpl - JS strings should us JS escaping

2 years agoMultipleRecordFieldsListing.tpl - JS strings should us JS escaping
Tim Otten [Thu, 19 May 2022 04:50:15 +0000 (21:50 -0700)]
MultipleRecordFieldsListing.tpl - JS strings should us JS escaping

2 years agoMerge pull request #23497 from totten/5.50-schedrem-bool
Eileen McNaughton [Thu, 19 May 2022 05:28:44 +0000 (17:28 +1200)]
Merge pull request #23497 from totten/5.50-schedrem-bool

Restore `civicrm_action_schedule.limit_to` (5.50)

2 years agoFiveFortyNine - Tweak task title
Tim Otten [Thu, 19 May 2022 02:32:46 +0000 (19:32 -0700)]
FiveFortyNine - Tweak task title

2 years agoFiveFortyNine - Revise message about "limit to"
Tim Otten [Wed, 18 May 2022 23:33:37 +0000 (16:33 -0700)]
FiveFortyNine - Revise message about "limit to"

1. This fixes a problem where the message shows at the opposite-of-correct time
   (ie it should display on builds that have already run 5.49.{beta,0,1}, but
   it actually displayed on builds that have not run 5.49.{beta,0,1})

2. This makes the pre+post messages match.

2 years agoFiveFortyNine - Don't munge soft credit 'limit-to'
Tim Otten [Wed, 18 May 2022 22:02:12 +0000 (15:02 -0700)]
FiveFortyNine - Don't munge soft credit 'limit-to'

I'm not sure what it even means to limit a scheduled-reminder to a "soft_credit_type".

But it's a thing - I can use the 5.48 GUI to create it. Here's how it looks in the DB (in 5.48):

+----+------------------------------------------+------------------+----------+------------------+-------------------+----------+
| id | title                                    | recipient        | limit_to | recipient_manual | recipient_listing | group_id |
+----+------------------------------------------+------------------+----------+------------------+-------------------+----------+
| 11 | Limit To - Soft Credit                   | soft_credit_type |        1 | NULL             | in_memory_of      |     NULL |
+----+------------------------------------------+------------------+----------+------------------+-------------------+----------+

The `changeBooleanColumnLimitTo()` was coercing down to `limit_to=null` because it lacked `recipient_manual` and `group_id`.

2 years agoFiveFortyNine - Fix guard on `changeBooleanColumnLimitTo()`
Tim Otten [Wed, 18 May 2022 21:58:42 +0000 (14:58 -0700)]
FiveFortyNine - Fix guard on `changeBooleanColumnLimitTo()`

2 years agoadd pre+post upgrade message
Monish Deb [Wed, 18 May 2022 11:41:09 +0000 (17:11 +0530)]
add pre+post upgrade message

2 years agoFiveFortyNine - Draft message for 5.49.2
Monish Deb [Wed, 18 May 2022 04:36:43 +0000 (10:06 +0530)]
FiveFortyNine - Draft message for 5.49.2

2 years agoRevert civicrm_action_schedule.limit_to boolean column to be NULL
Monish Deb [Tue, 17 May 2022 07:01:23 +0000 (12:31 +0530)]
Revert civicrm_action_schedule.limit_to boolean column to be NULL

2 years agoMerge pull request #23481 from alifrumin/rn5.50
Eileen McNaughton [Tue, 17 May 2022 19:33:14 +0000 (07:33 +1200)]
Merge pull request #23481 from alifrumin/rn5.50

[NFC] First pass at 5.50 release notes

2 years ago[NFC] first stab at 5.50 release notes
Alice Frumin [Fri, 13 May 2022 00:29:23 +0000 (20:29 -0400)]
[NFC] first stab at 5.50 release notes

2 years agoMerge pull request #23447 from agh1/5.50.0-releasenotes-initial
Tim Otten [Thu, 12 May 2022 19:34:35 +0000 (12:34 -0700)]
Merge pull request #23447 from agh1/5.50.0-releasenotes-initial

5.50.0 release notes initial run

2 years ago5.50.0 release notes: added boilerplate
Andie Hunt [Thu, 12 May 2022 18:02:14 +0000 (14:02 -0400)]
5.50.0 release notes: added boilerplate

2 years ago5.50.0 release notes: raw from script
Andie Hunt [Thu, 12 May 2022 17:58:20 +0000 (13:58 -0400)]
5.50.0 release notes: raw from script

2 years agoMerge pull request #23440 from totten/5.50-since-when
colemanw [Wed, 11 May 2022 23:58:50 +0000 (19:58 -0400)]
Merge pull request #23440 from totten/5.50-since-when

(NFC) mixin/mgd-php@1 - Twiddle `@since`

2 years ago(NFC) mixin/mgd-php@1 - Twiddle `@since`
Tim Otten [Wed, 11 May 2022 22:00:11 +0000 (15:00 -0700)]
(NFC) mixin/mgd-php@1 - Twiddle `@since`

Overview
--------

Switch `@since` from "modified" version to "introduced" version.

Comment
-------

The [spec for `@since`](https://docs.phpdoc.org/guide/references/phpdoc/tags/since.html)
is more open ("when an element was introduced _or_ modified"), but this matches similar
usages in the same repo.

2 years agoMerge pull request #23423 from totten/5.50-mixin-since
Eileen McNaughton [Tue, 10 May 2022 23:44:04 +0000 (11:44 +1200)]
Merge pull request #23423 from totten/5.50-mixin-since

(NFC) mixin/**.php - Add @since tags

2 years agoMerge pull request #23422 from totten/5.50-mgd-ver
colemanw [Tue, 10 May 2022 23:10:02 +0000 (19:10 -0400)]
Merge pull request #23422 from totten/5.50-mgd-ver

ManagedEntities - Update version number for mgd-php

2 years agotools/mixin/bin/mixer - Display the `@since` data
Tim Otten [Tue, 10 May 2022 21:50:56 +0000 (14:50 -0700)]
tools/mixin/bin/mixer - Display the `@since` data

2 years ago(NFC) mixin - Add `@since` tags
Tim Otten [Tue, 10 May 2022 21:36:46 +0000 (14:36 -0700)]
(NFC) mixin - Add `@since` tags

2 years agoManagedEntities - Update version number for mgd-php
Tim Otten [Tue, 10 May 2022 21:26:06 +0000 (14:26 -0700)]
ManagedEntities - Update version number for mgd-php

This is a follow-up/correction for #22959 (circa 5.50.alpha1; specifically
fdc67a75b2f20aea9f0961683bd8a59c78755d5f). The prior revision had updated the
behavior of `mgd-php`, so it should have also updated the version-number.

2 years agoMerge pull request #23412 from colemanw/inputTypes
Eileen McNaughton [Mon, 9 May 2022 19:50:35 +0000 (07:50 +1200)]
Merge pull request #23412 from colemanw/inputTypes

Afform - Fix RC regression of missing input types

2 years agoAfform - Fix RC regression of missing input types
Coleman Watts [Mon, 9 May 2022 15:59:15 +0000 (11:59 -0400)]
Afform - Fix RC regression of missing input types

This regressed because the client-side variable was renamed as
part of 47332dba8ff22aa6f08d473a0437dc02ca53458d

2 years agoMerge pull request #23407 from eileenmcnaughton/import_550
demeritcowboy [Mon, 9 May 2022 15:56:59 +0000 (11:56 -0400)]
Merge pull request #23407 from eileenmcnaughton/import_550

[Import] Fix 5.50 error url

2 years ago[Import] Fix 5.50 error url
Eileen McNaughton [Mon, 9 May 2022 11:13:20 +0000 (23:13 +1200)]
[Import] Fix 5.50 error url

2 years agoMerge pull request #23397 from totten/5.50-e2e-error
Seamus Lee [Sat, 7 May 2022 01:19:49 +0000 (11:19 +1000)]
Merge pull request #23397 from totten/5.50-e2e-error

(E2E) `testErrorChrome` - Update assertions for page-chrome

2 years agoMerge pull request #23398 from totten/5.50-e2e-error-bd
Seamus Lee [Sat, 7 May 2022 01:12:33 +0000 (11:12 +1000)]
Merge pull request #23398 from totten/5.50-e2e-error-bd

(E2E) testErrorChrome - Skip Backdrop and D8+ (much like D7)

2 years agoMerge pull request #23394 from eileenmcnaughton/import_550
demeritcowboy [Sat, 7 May 2022 00:25:39 +0000 (20:25 -0400)]
Merge pull request #23394 from eileenmcnaughton/import_550

Import 550

2 years agoMerge pull request #23396 from totten/5.50-upgrade-esc
Tim Otten [Fri, 6 May 2022 23:56:24 +0000 (16:56 -0700)]
Merge pull request #23396 from totten/5.50-upgrade-esc

5.50.alpha1.mysql.tpl - Escape `grouping` (reserved word in MySQL 8.0)

2 years ago(E2E) testErrorChrome - Revise page-chrome check for all Drupal-style UFs
Tim Otten [Fri, 6 May 2022 23:35:11 +0000 (16:35 -0700)]
(E2E) testErrorChrome - Revise page-chrome check for all Drupal-style UFs

2 years ago(E2E) testErrorChrome - Skip Backdrop and D8+ (much like D7)
Tim Otten [Fri, 6 May 2022 22:48:43 +0000 (15:48 -0700)]
(E2E) testErrorChrome - Skip Backdrop and D8+ (much like D7)

This test was added during 5.50.alpha (#23257, #22805).  It's purpose is to
assert that the page-chrome/site-wide-template is present on certain
error-messages; however, the underlying behavior was only implemented on
WordPress. It has not yet been implemented on other CMS.

Before
------

* __WordPress__: Runs testErrorChrome. Expected to pass.
* __Drupal 7__: Skip testErrorChrome (mostly) because it is expected to fail.
* __Drupal 8+, Backdrop__: Runs testErrorChrome. Fails.

After
-----

* __WordPress__: Runs testErrorChrome. Expected to pass.
* ___Drupal 7, Drupal 8+, Backdrop__: Skip testErrorChrome (mostly) because it is expected to fail.

Comment
-------

It still runs `testErrorChrome` for `permission` errors; per MM discussion, it appears that this does actually work, but we need
to tune assertion for BD+D8.

2 years ago(E2E) `testErrorChrome` - Update to work with current wp-demo build
Tim Otten [Fri, 6 May 2022 22:35:04 +0000 (15:35 -0700)]
(E2E) `testErrorChrome` - Update to work with current wp-demo build

This test was added during 5.50.alpha (#23257, #22805).  It's purpose is to
assert that the page-chrome/site-wide-template is present.  It appears that
the markup from WordPress has changed slightly.  (It may be that I
originally tested against an older version of WP.) In any event, this
relaxes the test so that it also passes on a newer WP build.

2 years ago5.50.alpha1.mysql.tpl - Escape `grouping` (reserved word in MySQL 8.0.1+)
Tim Otten [Fri, 6 May 2022 22:20:35 +0000 (15:20 -0700)]
5.50.alpha1.mysql.tpl - Escape `grouping` (reserved word in MySQL 8.0.1+)

2 years agoImport - also export invalid as export error
Eileen McNaughton [Fri, 6 May 2022 21:48:10 +0000 (09:48 +1200)]
Import - also export invalid as export error

I found that rows that fail validation are marked 'invalid'
rather than error & won't show on the preview screen.

I guess I could check for invalid vs error separately
- gets kinda weird though - if you leave them
in the file you are importing surely they are still errors
to see on the summary screen even though
you knew they were invalid on the Preview?

2 years agoMerge pull request #23389 from colemanw/getFieldsContactTypeFix
demeritcowboy [Fri, 6 May 2022 17:21:05 +0000 (13:21 -0400)]
Merge pull request #23389 from colemanw/getFieldsContactTypeFix

APIv4 - Fix fatal error on getFields when passing in contact id

2 years agoAPIv4 - Fix fatal error on getFields when passing in contact id
Coleman Watts [Fri, 6 May 2022 15:37:30 +0000 (11:37 -0400)]
APIv4 - Fix fatal error on getFields when passing in contact id

2 years agoMerge pull request #23387 from totten/5.50-cacert
Seamus Lee [Fri, 6 May 2022 07:11:42 +0000 (17:11 +1000)]
Merge pull request #23387 from totten/5.50-cacert

Update expired root certs (5.50)

2 years agoupdate expired root certs
demeritcowboy [Thu, 5 May 2022 12:30:52 +0000 (08:30 -0400)]
update expired root certs

2 years agoSet version to 5.50.beta1
CiviCRM [Fri, 6 May 2022 05:37:59 +0000 (05:37 +0000)]
Set version to 5.50.beta1

2 years agoMerge pull request #23343 from eileenmcnaughton/import_parser_job
Seamus Lee [Thu, 5 May 2022 23:22:37 +0000 (09:22 +1000)]
Merge pull request #23343 from eileenmcnaughton/import_parser_job

[REF] [Import] Stop passing submittedValues as parameters

2 years agoMerge pull request #23380 from eileenmcnaughton/import_conflict
Seamus Lee [Thu, 5 May 2022 23:06:28 +0000 (09:06 +1000)]
Merge pull request #23380 from eileenmcnaughton/import_conflict

[REF] [Import] Remove another good intention - import 'conflicts'

2 years agoMerge pull request #23381 from colemanw/searchKitDateFields
Seamus Lee [Thu, 5 May 2022 23:06:15 +0000 (09:06 +1000)]
Merge pull request #23381 from colemanw/searchKitDateFields

SearchKit - Add date pseudo-fields

2 years agoMerge pull request #23371 from eileenmcnaughton/import_valid
Seamus Lee [Thu, 5 May 2022 22:27:52 +0000 (08:27 +1000)]
Merge pull request #23371 from eileenmcnaughton/import_valid

[REF] [Import] extract validation functionality

2 years ago[REF] [Import] Remove another good intention - conflict
Eileen McNaughton [Thu, 5 May 2022 19:59:07 +0000 (07:59 +1200)]
[REF] [Import] Remove another good intention - conflict

There is all sorts of handling for 'conflict' - but a conflict return code is never
generated

2 years ago[REF] [Import] Stop passing submittedValues as parameters
Eileen McNaughton [Tue, 3 May 2022 02:31:35 +0000 (14:31 +1200)]
[REF] [Import] Stop passing submittedValues as parameters

These parameters are all availabe via

2 years agoExtract validateValues
Eileen McNaughton [Thu, 5 May 2022 04:18:38 +0000 (16:18 +1200)]
Extract validateValues

2 years agoMerge pull request #23378 from colemanw/searchKitNow
Eileen McNaughton [Thu, 5 May 2022 19:42:50 +0000 (07:42 +1200)]
Merge pull request #23378 from colemanw/searchKitNow

APIv4 - Add NOW() date function

2 years agoMerge pull request #23379 from samuelsov/tsOnOff
Eileen McNaughton [Thu, 5 May 2022 19:41:58 +0000 (07:41 +1200)]
Merge pull request #23379 from samuelsov/tsOnOff

Translation - distinguish between 'On' for date and 'On'/'Off'

2 years agoSearchKit - Add date pseudo-fields
Coleman Watts [Thu, 5 May 2022 18:28:02 +0000 (14:28 -0400)]
SearchKit - Add date pseudo-fields

2 years agoMerge pull request #21993 from mattwire/aclcachequery2
Matthew Wire [Thu, 5 May 2022 18:04:52 +0000 (19:04 +0100)]
Merge pull request #21993 from mattwire/aclcachequery2

ACLCache: Efficiency. Fix duplicate inserts

2 years agoTranslation - distinguish between 'On' for date and 'On'/'Off'
Samuel Vanhove [Thu, 5 May 2022 17:07:24 +0000 (13:07 -0400)]
Translation - distinguish between 'On' for date and 'On'/'Off'

2 years agoMerge pull request #23369 from eileenmcnaughton/import_var
colemanw [Thu, 5 May 2022 15:31:37 +0000 (11:31 -0400)]
Merge pull request #23369 from eileenmcnaughton/import_var

[REF] [Import] Trivial - simplify variables

2 years agoAPIv4 - Add NOW() date function
Coleman Watts [Thu, 5 May 2022 14:42:20 +0000 (10:42 -0400)]
APIv4 - Add NOW() date function

Adds a function for NOW which returns the full date+time, and distinguishes
it from CURDATE which just returns the date part.

2 years agoMerge pull request #23377 from colemanw/month
colemanw [Thu, 5 May 2022 14:48:34 +0000 (10:48 -0400)]
Merge pull request #23377 from colemanw/month

APIv4 - Add MONTH sql function

2 years agoMerge pull request #23375 from eileenmcnaughton/ref
demeritcowboy [Thu, 5 May 2022 13:59:18 +0000 (09:59 -0400)]
Merge pull request #23375 from eileenmcnaughton/ref

[Ref] Get rid of private deprecated legacy function

2 years agoMerge pull request #23282 from eileenmcnaughton/import_default_location_type
Monish Deb [Thu, 5 May 2022 13:55:37 +0000 (19:25 +0530)]
Merge pull request #23282 from eileenmcnaughton/import_default_location_type

[REF] Do not treat site having a default location type as optional

2 years agoMerge pull request #23292 from eileenmcnaughton/import_output_table
Monish Deb [Thu, 5 May 2022 13:52:08 +0000 (19:22 +0530)]
Merge pull request #23292 from eileenmcnaughton/import_output_table

[Import] Output errors, duplicates csvs directly from the user job table

2 years agoAPIv4 - Add MONTH sql function
Coleman Watts [Thu, 5 May 2022 13:09:27 +0000 (09:09 -0400)]
APIv4 - Add MONTH sql function

2 years ago[Ref] Get rid of private deprecated legacy function
Eileen McNaughton [Thu, 5 May 2022 11:12:58 +0000 (23:12 +1200)]
[Ref] Get rid of private deprecated legacy function

It now doesn't have enough code to justify it's own function

2 years agoMerge pull request #23368 from eileenmcnaughton/ref
colemanw [Thu, 5 May 2022 11:02:48 +0000 (07:02 -0400)]
Merge pull request #23368 from eileenmcnaughton/ref

[REF] Minor code simplifcation - reduce silly lines

2 years agoRemove conflict download from preview
Eileen McNaughton [Wed, 4 May 2022 20:30:42 +0000 (08:30 +1200)]
Remove conflict download from preview

I can't see where these would arise - but definitely
not on the preview screen - which only runs basic validation

2 years agoAdd output form for csv-on-the-fly
Eileen McNaughton [Sun, 24 Apr 2022 02:41:05 +0000 (14:41 +1200)]
Add output form for csv-on-the-fly

2 years agoMake tablename a property of the datasource
Eileen McNaughton [Thu, 21 Apr 2022 15:31:40 +0000 (03:31 +1200)]
Make tablename a property of the datasource

The datasource stores the table name on the job - we don't need to pass it around.

Also - stop cleaning up the temp table at the end - we want it to
output results but will add a cleanup routine later

2 years agoMove adding status fields on import table to datasource
Eileen McNaughton [Thu, 21 Apr 2022 04:12:07 +0000 (16:12 +1200)]
Move adding status fields on import table to datasource

2 years agoCleanup cleanup on old tables for form re-submission
Eileen McNaughton [Thu, 21 Apr 2022 03:48:56 +0000 (15:48 +1200)]
Cleanup cleanup on old tables for form re-submission

2 years ago[REF] [Import] Remove always NULL parameter from private function
Eileen McNaughton [Thu, 5 May 2022 06:08:07 +0000 (18:08 +1200)]
[REF] [Import] Remove always NULL parameter from private function

2 years agoMerge pull request #23374 from eileenmcnaughton/549_up
Eileen McNaughton [Thu, 5 May 2022 09:26:36 +0000 (21:26 +1200)]
Merge pull request #23374 from eileenmcnaughton/549_up

549 to master

2 years agoMerge pull request #23356 from eileenmcnaughton/pp
Tim Otten [Thu, 5 May 2022 09:16:59 +0000 (02:16 -0700)]
Merge pull request #23356 from eileenmcnaughton/pp

Ensure comma not formatted into amount

2 years agoMerge pull request #23366 from eileenmcnaughton/import_tpl
Eileen McNaughton [Thu, 5 May 2022 07:22:10 +0000 (19:22 +1200)]
Merge pull request #23366 from eileenmcnaughton/import_tpl

[REF] [Import] Remove unused tpl assign showColNames

2 years agoEnsure comma not formatted into amount
Eileen McNaughton [Wed, 4 May 2022 07:14:19 +0000 (19:14 +1200)]
Ensure comma not formatted into amount

Probably the function doesn't add anything as params['amount']
should be correctly formatted - however,
it shouldn't add a comma - per
https://github.com/eileenmcnaughton/nz.co.fuzion.omnipaymultiprocessor/issues/227

2 years agoMerge pull request #23370 from eileenmcnaughton/import_catch
Seamus Lee [Thu, 5 May 2022 06:00:27 +0000 (16:00 +1000)]
Merge pull request #23370 from eileenmcnaughton/import_catch

[Import] [Ref] [Minor] Simplify error handling with a try-catch block

2 years ago[REF] [Import] Trivial - simplify variables
Eileen McNaughton [Thu, 5 May 2022 03:01:52 +0000 (15:01 +1200)]
[REF] [Import] Trivial - simplify variables

2 years agoSimplify error handling with a try-catch block
Eileen McNaughton [Thu, 5 May 2022 03:55:52 +0000 (15:55 +1200)]
Simplify error handling with a try-catch block

2 years agoMerge pull request #23367 from eileenmcnaughton/import_prop
Eileen McNaughton [Thu, 5 May 2022 03:04:55 +0000 (15:04 +1200)]
Merge pull request #23367 from eileenmcnaughton/import_prop

[Ref][Import] Remove another good intention - random email counting

2 years agoMerge pull request #23363 from eileenmcnaughton/import_var
Eileen McNaughton [Thu, 5 May 2022 02:52:40 +0000 (14:52 +1200)]
Merge pull request #23363 from eileenmcnaughton/import_var

[REF] [Import] Trivial - simplify variables

2 years agoMerge pull request #23336 from colemanw/customGroupExtends
Eileen McNaughton [Thu, 5 May 2022 02:31:47 +0000 (14:31 +1200)]
Merge pull request #23336 from colemanw/customGroupExtends

CustomFields - Improve metadata about which custom groups belong to which entities

2 years ago[REF] Minor code simplifcation - reduce silly lines
Eileen McNaughton [Thu, 5 May 2022 01:12:05 +0000 (13:12 +1200)]
[REF] Minor code simplifcation - reduce silly lines

2 years agoMerge pull request #23364 from eileenmcnaughton/rel
Eileen McNaughton [Thu, 5 May 2022 01:06:15 +0000 (13:06 +1200)]
Merge pull request #23364 from eileenmcnaughton/rel

Minor function simplification in private function

2 years ago[Ref][Import] Remove another good intention - random email counting
Eileen McNaughton [Thu, 5 May 2022 00:03:57 +0000 (12:03 +1200)]
[Ref][Import] Remove another good intention - random email counting

2 years ago[REF] [Import] Trivial - simplify variables
Eileen McNaughton [Wed, 4 May 2022 21:58:44 +0000 (09:58 +1200)]
[REF] [Import] Trivial - simplify variables

2 years ago[REF] [Import] Remove unused tpl assign showColNames
Eileen McNaughton [Wed, 4 May 2022 23:33:19 +0000 (11:33 +1200)]
[REF] [Import] Remove unused tpl assign showColNames

2 years agoMerge pull request #22115 from artfulrobot/artfulrobot-api4-count-methods
colemanw [Wed, 4 May 2022 23:24:37 +0000 (19:24 -0400)]
Merge pull request #22115 from artfulrobot/artfulrobot-api4-count-methods

Implement countFetched() and countMatched() on api4 results.

2 years agoMerge pull request #23276 from eileenmcnaughton/flush
colemanw [Wed, 4 May 2022 23:20:01 +0000 (19:20 -0400)]
Merge pull request #23276 from eileenmcnaughton/flush

[Ref] [Import] Cleanup cleanup on old tables for form re-submission

2 years agoMerge pull request #23351 from lcdservices/dev-core-3439
Eileen McNaughton [Wed, 4 May 2022 22:38:28 +0000 (10:38 +1200)]
Merge pull request #23351 from lcdservices/dev-core-3439

dev/core#3439 change batch geocode query to include events

2 years agoMinor function simplification in private function
Eileen McNaughton [Wed, 4 May 2022 22:34:21 +0000 (10:34 +1200)]
Minor function simplification in private function

The function does 2 different things depending on whether if finds a duplicate
& having it in a sub-function doesn't make the parent class clearer....

2 years agoMerge pull request #23313 from herbdool/issue-3429
colemanw [Wed, 4 May 2022 22:17:22 +0000 (18:17 -0400)]
Merge pull request #23313 from herbdool/issue-3429

Issue 3249: make casetype a managed entity

2 years agoMerge pull request #23361 from eileenmcnaughton/import_comment
colemanw [Wed, 4 May 2022 22:15:22 +0000 (18:15 -0400)]
Merge pull request #23361 from eileenmcnaughton/import_comment

Import - fix comment

2 years agoAPIv3 - Fix testCustomDataGet errors caused by legacy entity naming issues
Coleman Watts [Wed, 4 May 2022 14:34:57 +0000 (10:34 -0400)]
APIv3 - Fix testCustomDataGet errors caused by legacy entity naming issues

2 years agoCustomFields - Improve metadata for custom_group_extends
Coleman Watts [Mon, 2 May 2022 12:08:31 +0000 (08:08 -0400)]
CustomFields - Improve metadata for custom_group_extends

This allows the API to filter custom groups by entity type and other values.

2 years agoCustomGroup - Add metadata about how a custom group relates to entity types
Coleman Watts [Sun, 1 May 2022 21:54:54 +0000 (17:54 -0400)]
CustomGroup - Add metadata about how a custom group relates to entity types

Fixes dev/core#2905
Before: Hard coded, plus a very strange use of the 'description' field to store a callback function.

After: The 'grouping' field in the OptionValue for custom extends and custom type is used.
APIv4 getfields can then retrieve the necessary options.

2 years agoMerge pull request #23362 from demeritcowboy/dao
colemanw [Wed, 4 May 2022 22:11:39 +0000 (18:11 -0400)]
Merge pull request #23362 from demeritcowboy/dao

DAOs out of date

2 years agoMerge pull request #23360 from eileenmcnaughton/import_var
Eileen McNaughton [Wed, 4 May 2022 21:52:51 +0000 (09:52 +1200)]
Merge pull request #23360 from eileenmcnaughton/import_var

[REF] [Import] Trivial - simplify variable

2 years agoMerge pull request #23339 from ginkgomzd/bermuda-parishes
Eileen McNaughton [Wed, 4 May 2022 20:40:01 +0000 (08:40 +1200)]
Merge pull request #23339 from ginkgomzd/bermuda-parishes

add missing Parishes of Bermuda (civicrm_state_province)

2 years agoDAOs out of date
demeritcowboy [Wed, 4 May 2022 20:08:36 +0000 (16:08 -0400)]
DAOs out of date

2 years agoMerge pull request #23288 from eileenmcnaughton/import_upgrade
colemanw [Wed, 4 May 2022 20:05:13 +0000 (16:05 -0400)]
Merge pull request #23288 from eileenmcnaughton/import_upgrade

[Import] Upgrade saved import names for contacts