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
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
Eileen McNaughton [Thu, 5 May 2022 04:18:38 +0000 (16:18 +1200)]
Extract validateValues
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
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'
Coleman Watts [Thu, 5 May 2022 18:28:02 +0000 (14:28 -0400)]
SearchKit - Add date pseudo-fields
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
Samuel Vanhove [Thu, 5 May 2022 17:07:24 +0000 (13:07 -0400)]
Translation - distinguish between 'On' for date and 'On'/'Off'
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
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.
colemanw [Thu, 5 May 2022 14:48:34 +0000 (10:48 -0400)]
Merge pull request #23377 from colemanw/month
APIv4 - Add MONTH sql function
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
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
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
Coleman Watts [Thu, 5 May 2022 13:09:27 +0000 (09:09 -0400)]
APIv4 - Add MONTH sql 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
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
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
Eileen McNaughton [Sun, 24 Apr 2022 02:41:05 +0000 (14:41 +1200)]
Add output form for csv-on-the-fly
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
Eileen McNaughton [Thu, 21 Apr 2022 04:12:07 +0000 (16:12 +1200)]
Move adding status fields on import table to datasource
Eileen McNaughton [Thu, 21 Apr 2022 03:48:56 +0000 (15:48 +1200)]
Cleanup cleanup on old tables for form re-submission
Eileen McNaughton [Thu, 5 May 2022 06:08:07 +0000 (18:08 +1200)]
[REF] [Import] Remove always NULL parameter from private function
Eileen McNaughton [Thu, 5 May 2022 09:26:36 +0000 (21:26 +1200)]
Merge pull request #23374 from eileenmcnaughton/549_up
549 to master
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
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
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
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
Eileen McNaughton [Thu, 5 May 2022 03:01:52 +0000 (15:01 +1200)]
[REF] [Import] Trivial - simplify variables
Eileen McNaughton [Thu, 5 May 2022 03:55:52 +0000 (15:55 +1200)]
Simplify error handling with a try-catch block
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
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
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
Eileen McNaughton [Thu, 5 May 2022 01:12:05 +0000 (13:12 +1200)]
[REF] Minor code simplifcation - reduce silly lines
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
Eileen McNaughton [Thu, 5 May 2022 00:03:57 +0000 (12:03 +1200)]
[Ref][Import] Remove another good intention - random email counting
Eileen McNaughton [Wed, 4 May 2022 21:58:44 +0000 (09:58 +1200)]
[REF] [Import] Trivial - simplify variables
Eileen McNaughton [Wed, 4 May 2022 23:33:19 +0000 (11:33 +1200)]
[REF] [Import] Remove unused tpl assign showColNames
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.
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
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
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....
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
colemanw [Wed, 4 May 2022 22:15:22 +0000 (18:15 -0400)]
Merge pull request #23361 from eileenmcnaughton/import_comment
Import - fix comment
Coleman Watts [Wed, 4 May 2022 14:34:57 +0000 (10:34 -0400)]
APIv3 - Fix testCustomDataGet errors caused by legacy entity naming issues
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.
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.
colemanw [Wed, 4 May 2022 22:11:39 +0000 (18:11 -0400)]
Merge pull request #23362 from demeritcowboy/dao
DAOs out of date
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
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)
demeritcowboy [Wed, 4 May 2022 20:08:36 +0000 (16:08 -0400)]
DAOs out of date
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
Eileen McNaughton [Wed, 4 May 2022 19:53:07 +0000 (07:53 +1200)]
Import - fix comment
colemanw [Wed, 4 May 2022 19:52:05 +0000 (15:52 -0400)]
Merge pull request #23340 from eileenmcnaughton/import_preview2
[REF][Import] [Contact] Clean up preview screen
Eileen McNaughton [Wed, 4 May 2022 19:49:53 +0000 (07:49 +1200)]
[REF] [Import] Trivial - simplify variable
Assign this->activeFields[i]->_relatedContactType to
a variable rather than keep repeating it.
Eileen McNaughton [Thu, 21 Apr 2022 03:48:56 +0000 (15:48 +1200)]
Cleanup cleanup on old tables for form re-submission
colemanw [Wed, 4 May 2022 19:42:32 +0000 (15:42 -0400)]
Merge pull request #23342 from eileenmcnaughton/import_map
[Import] [Ref] [Contact] Extract row mapping and add test
colemanw [Wed, 4 May 2022 19:27:39 +0000 (15:27 -0400)]
Merge pull request #23345 from eileenmcnaughton/cypr
Stop adding obsolete currencies to new installs
Eileen McNaughton [Wed, 4 May 2022 19:23:27 +0000 (07:23 +1200)]
Merge pull request #23357 from mattwire/participant
NFC Minor cleanup to Participant confirm
ginkgoMZD [Wed, 4 May 2022 18:54:57 +0000 (14:54 -0400)]
regen;
ginkgoMZD [Mon, 2 May 2022 22:19:42 +0000 (18:19 -0400)]
add missing Parishes of Bermuda (civicrm_state_province)
colemanw [Wed, 4 May 2022 18:51:38 +0000 (14:51 -0400)]
Merge pull request #23344 from eileenmcnaughton/import_functions
[Ref] [Import] Add extra functions to DataSource
colemanw [Wed, 4 May 2022 18:20:14 +0000 (14:20 -0400)]
Merge pull request #23359 from colemanw/managedDocs
[NFC] Fix APIv4 docblock annotations for Managed API
Coleman Watts [Wed, 4 May 2022 15:03:09 +0000 (11:03 -0400)]
NFC - Fix APIv4 docblock annotations for Managed API
demeritcowboy [Wed, 4 May 2022 11:56:37 +0000 (07:56 -0400)]
Merge pull request #23349 from eileenmcnaughton/import_var
[REF] [Import] Trivial - simplify variable
demeritcowboy [Wed, 4 May 2022 11:54:25 +0000 (07:54 -0400)]
Merge pull request #23352 from eileenmcnaughton/leg
Remove unused variable
Matthew Wire [Wed, 4 May 2022 10:44:19 +0000 (11:44 +0100)]
Minor cleanup to Participant confirm
Eileen McNaughton [Wed, 4 May 2022 06:51:44 +0000 (18:51 +1200)]
Merge pull request #23355 from colemanw/userJobIfNotExists
Fix 'Table already exists' error when running 5.50 upgrade twice
Eileen McNaughton [Wed, 4 May 2022 06:39:14 +0000 (18:39 +1200)]
Merge pull request #23354 from colemanw/searchKitDateField
SearchKit - Consistently check for date field
Coleman Watts [Wed, 4 May 2022 01:01:31 +0000 (21:01 -0400)]
Fix 'Table already exists' error when running 5.50 upgrade twice
Coleman Watts [Wed, 4 May 2022 00:49:56 +0000 (20:49 -0400)]
SearchKit - Consistently check for date field
Eileen McNaughton [Tue, 3 May 2022 03:40:32 +0000 (15:40 +1200)]
Add extra functions to DataSource
This adds functions from https://github.com/civicrm/civicrm-core/pull/23292 to
the DataSource class (without them being called as yet)
- part of trying to get to the point where fixes are not dependent on each other
colemanw [Tue, 3 May 2022 22:10:11 +0000 (18:10 -0400)]
Merge pull request #23350 from eileenmcnaughton/rel_cast
IDE cheer - cast var explicitly to an int
Eileen McNaughton [Tue, 3 May 2022 20:44:56 +0000 (08:44 +1200)]
Merge pull request #23310 from colemanw/api4Update
Api4 - minor fixes and updates
Eileen McNaughton [Tue, 3 May 2022 20:43:31 +0000 (08:43 +1200)]
Merge pull request #23321 from davejenx/report-column-nodisplay
PR 22070 follow-up: reinstate respecting no_display on report column headers
Eileen McNaughton [Tue, 3 May 2022 20:33:44 +0000 (08:33 +1200)]
Merge pull request #23348 from colemanw/getFieldsSuffixes
APIv4 - Support pseudoconstant suffixes in getFields
Eileen McNaughton [Tue, 3 May 2022 19:16:05 +0000 (07:16 +1200)]
Remove unused variable
Brian Shaughnessy [Tue, 3 May 2022 18:59:56 +0000 (14:59 -0400)]
dev/core#3439 change batch geocode query to include events
Eileen McNaughton [Tue, 3 May 2022 18:57:37 +0000 (06:57 +1200)]
IDE cheer - cast var explicitly to an int
Eileen McNaughton [Tue, 3 May 2022 17:57:49 +0000 (05:57 +1200)]
[REF] [Import] Trivial - simplify variable
Assign this->activeFields[i]->_relatedContactDetails to
a variable rather than keep repeating it.
Eileen McNaughton [Tue, 3 May 2022 00:48:07 +0000 (12:48 +1200)]
[Import] [Ref] [Contact] Extract row mapping and add test
Eileen McNaughton [Tue, 3 May 2022 17:44:17 +0000 (05:44 +1200)]
Merge pull request #23347 from eileenmcnaughton/import_var
[REF] [Import] Trivial - simplify variable
Coleman Watts [Tue, 3 May 2022 15:55:45 +0000 (11:55 -0400)]
APIv4 - Support pseudoconstant suffixes in getFields
colemanw [Tue, 3 May 2022 14:43:35 +0000 (10:43 -0400)]
Merge pull request #23261 from eileenmcnaughton/throw
[REF] [Import] Remove another good intention from the import class
Eileen McNaughton [Tue, 3 May 2022 12:58:39 +0000 (00:58 +1200)]
[REF] [Import] Trivial - simplify variable
Assign this->_activeFields[i]->_name to a variable
rather than keep repeating it...
Seamus Lee [Tue, 3 May 2022 07:30:44 +0000 (17:30 +1000)]
Merge pull request #23324 from agileware/CIVIUX-153
🇦🇺 jira/browse/CRM-18217 On the website front-end, CiviCRM page heading should start from h2 and not h1
Seamus Lee [Tue, 3 May 2022 07:26:54 +0000 (17:26 +1000)]
Merge pull request #23334 from colemanw/afformResetButton
AfformGui - Optional reset button for search and submit forms
Eileen McNaughton [Tue, 3 May 2022 04:18:38 +0000 (16:18 +1200)]
Stop adding obsolete currencies to new installs
CYP - Cyprus Pound
https://www.centralbank.cy/en/banknotes-and-coins/cyprus-pound
LTL - Lithuanian litas
https://en.wikipedia.org/wiki/Lithuanian_litas#:~:text=The%20Lithuanian%20litas%20(ISO%20currency,centas%2C%20nominative%20plural%20centai).
GWP - replaced in 1997 https://en.wikipedia.org/wiki/Guinea-Bissau_peso
LVL - https://www.investopedia.com/terms/forex/l/lvl-latvian-lat.asp#:~:text=The%20Latvian%20lats%20(LVL)%20was,was%20replaced%20by%20the%20euro.
MTL - https://www.investopedia.com/terms/m/mtl.asp
ROL - https://en.wikipedia.org/wiki/Romanian_leu
SDD - https://www.investopedia.com/terms/s/sdd-sudanese-dinar.asp#:~:text=The%20Sudanese%20dinar%20(SDD)%20was,replaced%20the%20original%20Sudanese%20pound.
SIT - https://www.investopedia.com/terms/s/sit-slovenian-tolar.asp
SKK - https://en.wikipedia.org/wiki/Slovak_koruna
TMM - https://en.wikipedia.org/wiki/Turkmenistani_manat
Eileen McNaughton [Thu, 21 Apr 2022 23:37:31 +0000 (11:37 +1200)]
[REF] Do not treat site having a default location type as optional
I found plenty of places where the code expects a response from
this function - just a couple of places in really old code
(like this) where it is optional....
Eileen McNaughton [Mon, 2 May 2022 23:27:56 +0000 (11:27 +1200)]
[REF][Import] [Contact] Clean up preview screen
This gets rid of the crazy code on the preview screen - relying on getMappingFieldFromMapperInput
to compile the titles and
Eileen McNaughton [Mon, 2 May 2022 00:49:55 +0000 (12:49 +1200)]
set contact type for map fields
Eileen McNaughton [Sat, 23 Apr 2022 01:58:48 +0000 (13:58 +1200)]
Update Save Field Mapping code to save in upgraded format
Eileen McNaughton [Fri, 22 Apr 2022 20:02:42 +0000 (08:02 +1200)]
Upgrade saved import names for contacts
style
Eileen McNaughton [Tue, 3 May 2022 02:01:37 +0000 (14:01 +1200)]
Merge pull request #23341 from eileenmcnaughton/import_test
[REF] [Import] [Trivial] Minor test fixes
Eileen McNaughton [Tue, 3 May 2022 02:00:51 +0000 (14:00 +1200)]
Merge pull request #23337 from eileenmcnaughton/import
Master only import regression - fix contactSubType handling
Eileen McNaughton [Tue, 3 May 2022 01:13:27 +0000 (13:13 +1200)]
Merge pull request #23338 from eileenmcnaughton/import_preview
Add import function to parser
Eileen McNaughton [Mon, 2 May 2022 23:59:54 +0000 (11:59 +1200)]
[REF] [Import] [Trivial] Minor test fixes
This just fixes some of the import parser tests to be more
realistic - notably ensuring the userJobID is set - which
is now required, and making the params for
setting that up more flexible within the test class
Eileen McNaughton [Mon, 2 May 2022 20:44:22 +0000 (08:44 +1200)]
Master only import regression - fix contactSubType handling
I found that the fieldname for contactSubType was actually subType
so renamed to contactSubType & ensured the type was set before
metadata loading
Eileen McNaughton [Mon, 2 May 2022 22:04:14 +0000 (10:04 +1200)]
Add import function to parser
This function is not used in this PR but added in
https://github.com/civicrm/civicrm-core/pull/23288/
- however, that PR is a bit stalled & getting the function added also allows
for other places to call it (ie kill off the enotices on the preview
screen and remove all the silly parameters in the construct)
so trying to get just the function merged
Eileen McNaughton [Wed, 20 Apr 2022 09:40:06 +0000 (21:40 +1200)]
Remove another good intention from the import class
Once upon a time - the import classes were written....
Back then it seemed like a good idea to give the derived classes
a way to abort processing.
Like unicorns and mermaids derived classes turned out to
be mythical creatures - not even found by searching the
git universe....