Eileen McNaughton [Sun, 9 Jan 2022 23:52:45 +0000 (12:52 +1300)]
Simplify variables pass in & out of function
Rather than compiling an array, pass in the 3 values. Also
its now obvious that there is only a max of 1 contact_check in the function
so just return rather than 'continuing' (allowing us to de-loop in a more
whitespacey follow up)
Seamus Lee [Mon, 10 Jan 2022 02:30:52 +0000 (13:30 +1100)]
Merge pull request #22440 from eileenmcnaughton/legg
Clean up input and outputs
colemanw [Mon, 10 Jan 2022 01:56:55 +0000 (20:56 -0500)]
Merge pull request #22441 from civicrm/5.46
5.46
colemanw [Mon, 10 Jan 2022 00:40:09 +0000 (19:40 -0500)]
Merge pull request #22435 from colemanw/subscriptionHistory
APIv4 - Add SubscriptionHistory entity
colemanw [Mon, 10 Jan 2022 00:39:19 +0000 (19:39 -0500)]
Merge pull request #22436 from eileenmcnaughton/noticeme
Enotice fix
Eileen McNaughton [Mon, 10 Jan 2022 00:25:54 +0000 (13:25 +1300)]
Merge pull request #22437 from MegaphoneJon/broken-search-urls
fixes report#93: SearchKit shows broken external URLs
demeritcowboy [Mon, 10 Jan 2022 00:02:40 +0000 (19:02 -0500)]
Merge pull request #22429 from colemanw/fixMoneyType2
Fix input type for smarty number formatting (more forgiving)
Eileen McNaughton [Mon, 10 Jan 2022 00:01:30 +0000 (13:01 +1300)]
Clean up input and outputs
By grepping universe we can see that params['contact_check'] only ever has one value when called
from the supported core place and the unsupported jma grant application extension place.
By clarifying that here we can do further cleanup without having to re-search universe...
Eileen McNaughton [Sun, 9 Jan 2022 23:43:55 +0000 (12:43 +1300)]
Merge pull request #22428 from civicrm/5.46
5.46
Eileen McNaughton [Sun, 9 Jan 2022 23:30:00 +0000 (12:30 +1300)]
Merge pull request #20884 from MegaphoneJon/financial-89
don't allow multiple currencies in a batch
Seamus Lee [Sun, 9 Jan 2022 23:06:12 +0000 (10:06 +1100)]
Merge pull request #22431 from eileenmcnaughton/leg
[REF] Rename variable to be meaningful
Jon Goldberg [Sun, 9 Jan 2022 22:48:33 +0000 (17:48 -0500)]
fixes report#93: SearchKit shows broken external URLs
Eileen McNaughton [Sun, 9 Jan 2022 22:39:58 +0000 (11:39 +1300)]
Enotice fix
Coleman Watts [Sun, 9 Jan 2022 22:27:33 +0000 (17:27 -0500)]
APIv4 - Add SubscriptionHistory entity
Coleman Watts [Sat, 8 Jan 2022 22:10:02 +0000 (17:10 -0500)]
Fix input type for smarty number formatting
Some smarty templates pass NULL to crmMoney, so it needs to handle that possibilty
Eileen McNaughton [Sun, 9 Jan 2022 22:06:54 +0000 (11:06 +1300)]
Merge pull request #22430 from colemanw/navigationDefaults
Navigation - Make required fields NOT NULL
Eileen McNaughton [Sun, 9 Jan 2022 22:05:29 +0000 (11:05 +1300)]
Merge pull request #22433 from braders/gotv-tpl-formatting
[REF] Tidy up formatting in gotv.tpl, remove extra </div>
Eileen McNaughton [Sun, 9 Jan 2022 22:02:17 +0000 (11:02 +1300)]
Merge pull request #22432 from braders/tidy-report-template-code
Tidy CRM_Report_Page_Options code
colemanw [Sun, 9 Jan 2022 15:40:26 +0000 (10:40 -0500)]
Merge pull request #22434 from braders/phpdoc-class-reference-fixes
Fix class references in phpdoc comments
Bradley Taylor [Sun, 9 Jan 2022 11:56:30 +0000 (11:56 +0000)]
Fix class references in phpdoc comments
Bradley Taylor [Sun, 9 Jan 2022 11:06:16 +0000 (11:06 +0000)]
Tidy up formatting in gotv.tpl, fix missing </div>
Eileen McNaughton [Thu, 6 Jan 2022 21:30:09 +0000 (10:30 +1300)]
[REF] Rename variable to be meaningful
It turns out key is organizationID - rename ...
I did this in both places the function is called from - as I clean up the copy some
cleanups on the original emerge too
colemanw [Sun, 9 Jan 2022 04:35:30 +0000 (23:35 -0500)]
Merge pull request #22401 from eileenmcnaughton/legit
[REF] Stop returning unused variables
Eileen McNaughton [Sun, 9 Jan 2022 04:24:58 +0000 (17:24 +1300)]
Merge pull request #22426 from colemanw/writeRecordsCustom
[REF] Centralize BAO handling of custom data
Coleman Watts [Sun, 9 Jan 2022 02:51:03 +0000 (21:51 -0500)]
Navigation - Make required fields NOT NULL
Coleman Watts [Sun, 9 Jan 2022 02:27:03 +0000 (21:27 -0500)]
APIv3 Navigation - Add defaults so generic writeRecord can be used instead of BAO::add
Seamus Lee [Sat, 8 Jan 2022 22:19:49 +0000 (09:19 +1100)]
Merge pull request #22418 from demeritcowboy/isdir-7-8-546
[NFC] isDir unit test fails on php 7 'min' matrix
demeritcowboy [Sat, 8 Jan 2022 21:28:11 +0000 (16:28 -0500)]
Merge pull request #22420 from eileenmcnaughton/case
Remove / deprecate case param handling
demeritcowboy [Sat, 8 Jan 2022 21:03:25 +0000 (16:03 -0500)]
Merge pull request #22425 from braders/remove-htmlfile-rule
Remove htmlFile validation rule, as it can't possibly work.
colemanw [Sat, 8 Jan 2022 19:31:11 +0000 (14:31 -0500)]
Merge pull request #22417 from eileenmcnaughton/construct
Fight back against copy & paste gone wild
Bradley Taylor [Sat, 8 Jan 2022 19:17:08 +0000 (19:17 +0000)]
Tidy CRM_Report_Page_Options code
Coleman Watts [Sat, 8 Jan 2022 19:13:12 +0000 (14:13 -0500)]
APIv3 - Refactor basic_create to use writeRecords when create/add functions are deprecated
- Stops passing the deprecated `$ids` param to BAO::create
- Uses BAO::writeRecord when BAO::create or BAO::add are `@deprecated`
- Trust BAO::writeRecord to handle custom data
Coleman Watts [Fri, 7 Jan 2022 05:49:43 +0000 (00:49 -0500)]
DAO - Update writeRecords function to also save custom data
Refactors a couple BAOs which use writeRecords, as they no longer need to
write the custom data themselves.
Bradley Taylor [Sat, 8 Jan 2022 17:59:27 +0000 (17:59 +0000)]
Remove htmlFile validation rule,
as it can't possibly work.
colemanw [Sat, 8 Jan 2022 15:31:25 +0000 (10:31 -0500)]
Merge pull request #22424 from braders/query-param-phpdoc-fixes
Fix phpdoc types for $_query in CRM_Core_Selector_Base subclasses
colemanw [Sat, 8 Jan 2022 15:29:07 +0000 (10:29 -0500)]
Merge pull request #22423 from braders/queryformatter-docblock
[NFC] Tidy up phpdoc in CRM_Utils_QueryFormatter
Bradley Taylor [Sat, 8 Jan 2022 12:14:31 +0000 (12:14 +0000)]
Fix phpdoc types for $_query in CRM_Core_Selector_Base subclasses
Bradley Taylor [Sat, 8 Jan 2022 12:08:55 +0000 (12:08 +0000)]
[NFC] Tidy up phpdoc in CRM_Utils_QueryFormatter
Eileen McNaughton [Sat, 8 Jan 2022 02:54:01 +0000 (15:54 +1300)]
Merge pull request #22416 from eileenmcnaughton/depit
Increase GroupContact:create deprecation
Eileen McNaughton [Thu, 6 Jan 2022 21:42:37 +0000 (10:42 +1300)]
Remove / deprecate case code
It's clear it can't be passed in from the separated off version & it also is not reached from
the importer - which leaves only external usages (not supported but deprecation will do for now)
colemanw [Sat, 8 Jan 2022 02:08:49 +0000 (21:08 -0500)]
Merge pull request #22410 from eileenmcnaughton/rel
Stop returning unused parameters
Eileen McNaughton [Fri, 7 Jan 2022 02:06:19 +0000 (15:06 +1300)]
[REF] Stop returning unused variables
Only 2 code places call this function (one an unsupported call outside core but in universe & the other in Parser_Contact)
and only the latter uses ANY of the return variables - this fixes the function to stop
returning those that are never used - this stops them from returning them
Eileen McNaughton [Sat, 8 Jan 2022 01:15:49 +0000 (14:15 +1300)]
Fight back against copy & paste gone wild
Eileen McNaughton [Sat, 8 Jan 2022 01:43:52 +0000 (14:43 +1300)]
Merge pull request #22415 from colemanw/deprecatedDocblocks
APIv4 - Docblock updates, mark BAO::create functions deprecated
Eileen McNaughton [Sat, 8 Jan 2022 01:43:37 +0000 (14:43 +1300)]
Merge pull request #22414 from colemanw/fixTest
APIv4 - Fix test
Eileen McNaughton [Sat, 8 Jan 2022 01:43:27 +0000 (14:43 +1300)]
Merge pull request #22413 from colemanw/fixDecodeRows
APIv4 - Fix incorrect placement of decodeRows in loop
demeritcowboy [Sat, 8 Jan 2022 01:41:57 +0000 (20:41 -0500)]
fails in unusual situation on php 7
Eileen McNaughton [Sat, 8 Jan 2022 01:01:55 +0000 (14:01 +1300)]
Increase GroupContact:create deprecation
Note the v3 api does not call this & no-where in core calls it directly.
Coleman Watts [Thu, 6 Jan 2022 20:20:21 +0000 (15:20 -0500)]
APIv4 - Docblock updates, mark BAO::create functions deprecated
Coleman Watts [Thu, 6 Jan 2022 19:32:11 +0000 (14:32 -0500)]
Fix test
Test can give false failure depending on site's contact display_name settings.
Coleman Watts [Thu, 6 Jan 2022 19:26:59 +0000 (14:26 -0500)]
APIv4 - Fix incorrect placement of decodeRows in loop
The funciton is designed to loop through all items, so needs to be placed
outside the loop that creates the items.
colemanw [Fri, 7 Jan 2022 23:56:51 +0000 (18:56 -0500)]
Merge pull request #22406 from eileenmcnaughton/rels
Remove unreachable else
Eileen McNaughton [Fri, 7 Jan 2022 23:36:02 +0000 (12:36 +1300)]
Merge pull request #22395 from eileenmcnaughton/legy
[REF] Remove handling for no organization being passed
Eileen McNaughton [Fri, 7 Jan 2022 23:35:32 +0000 (12:35 +1300)]
Merge pull request #22411 from eileenmcnaughton/dep
Remove deprecated code
Eileen McNaughton [Fri, 7 Jan 2022 22:25:46 +0000 (11:25 +1300)]
Merge pull request #22409 from colemanw/upgradeDocblock
NFC - Fix typo in docblock
Eileen McNaughton [Fri, 7 Jan 2022 21:16:23 +0000 (10:16 +1300)]
Remove deprecated code
Eileen McNaughton [Fri, 7 Jan 2022 00:32:58 +0000 (13:32 +1300)]
Simplify determination of organizationID
Eileen McNaughton [Fri, 7 Jan 2022 00:18:04 +0000 (13:18 +1300)]
[REF] Remove handling for no organization being passed
Eileen McNaughton [Thu, 6 Jan 2022 21:16:03 +0000 (10:16 +1300)]
Stop returning unused parameters
Coleman Watts [Fri, 7 Jan 2022 20:05:49 +0000 (15:05 -0500)]
NFC - Fix typo in docblock
colemanw [Fri, 7 Jan 2022 19:30:41 +0000 (14:30 -0500)]
Merge pull request #22407 from eileenmcnaughton/rel
Remove check for contact_check as it is always an array here
demeritcowboy [Fri, 7 Jan 2022 12:08:19 +0000 (07:08 -0500)]
Merge pull request #20561 from WeMoveEU/fix/double-autosave
dev/core#2587 Ignore modified_date when checking for changes during mailing auto-save
demeritcowboy [Fri, 7 Jan 2022 12:07:30 +0000 (07:07 -0500)]
Merge pull request #22274 from eileenmcnaughton/mems
Fix testMultipleMembershipsContribution to use order api
Eileen McNaughton [Thu, 6 Jan 2022 20:54:31 +0000 (09:54 +1300)]
Remove check for contact_check as it is always an array here
Eileen McNaughton [Fri, 7 Jan 2022 08:50:50 +0000 (21:50 +1300)]
Remove unreachable else
Eileen McNaughton [Fri, 7 Jan 2022 08:47:01 +0000 (21:47 +1300)]
Merge pull request #22404 from eileenmcnaughton/hooky
Stop calling hook twice
Eileen McNaughton [Fri, 7 Jan 2022 03:05:58 +0000 (16:05 +1300)]
Stop calling hook twice
Per the code comments this hook is called here but also in add. This is all about the crazy
history of this function - which used to be tied to the relationship form.
I can't think of any valid use for calling the hook twice - but I can think of reasons it
would be bad...
Eileen McNaughton [Fri, 7 Jan 2022 06:33:44 +0000 (19:33 +1300)]
Merge pull request #22399 from eileenmcnaughton/data
Remove always-true IF
Eileen McNaughton [Fri, 7 Jan 2022 06:02:15 +0000 (19:02 +1300)]
Merge pull request #22398 from eileenmcnaughton/rel_add
[REF] Remove unused variable
Eileen McNaughton [Fri, 7 Jan 2022 05:58:28 +0000 (18:58 +1300)]
Merge pull request #22397 from eileenmcnaughton/silly
Remove unnecessary pass-by-ref
Eileen McNaughton [Fri, 7 Jan 2022 05:27:28 +0000 (18:27 +1300)]
Merge pull request #22320 from colemanw/activityDateMeta
Add metadata so Activity Created Date is available in Form Builder
colemanw [Fri, 7 Jan 2022 04:52:12 +0000 (23:52 -0500)]
Merge pull request #22379 from eileenmcnaughton/not1
Ensure assigned smarty array has empty keys (not no keys)
Eileen McNaughton [Fri, 7 Jan 2022 04:41:38 +0000 (17:41 +1300)]
Merge pull request #22402 from eileenmcnaughton/no_rel
Clarify contents of ids for further fixes
Eileen McNaughton [Sun, 19 Dec 2021 20:54:16 +0000 (09:54 +1300)]
Fix testMultipleMembershipsContribution to use order api
This test was not creating valid financial records prior to this
CiviCRM [Fri, 7 Jan 2022 03:24:15 +0000 (03:24 +0000)]
Set version to 5.47.alpha1
CiviCRM [Fri, 7 Jan 2022 03:23:36 +0000 (03:23 +0000)]
Set version to 5.46.beta1
Eileen McNaughton [Fri, 7 Jan 2022 03:16:01 +0000 (16:16 +1300)]
Merge pull request #22393 from eileenmcnaughton/no_ref
Remove unnecessary pass-by-ref
Eileen McNaughton [Fri, 7 Jan 2022 03:11:34 +0000 (16:11 +1300)]
Merge pull request #22392 from eileenmcnaughton/protect
Privatise function
Eileen McNaughton [Fri, 7 Jan 2022 01:37:47 +0000 (14:37 +1300)]
Clarify contents of ids for further fixes
Eileen McNaughton [Thu, 6 Jan 2022 20:53:38 +0000 (09:53 +1300)]
Remove always-true IF
Eileen McNaughton [Fri, 7 Jan 2022 01:45:58 +0000 (14:45 +1300)]
Merge pull request #22391 from eileenmcnaughton/legacy
[REF] Remove handling for relationshipID
Eileen McNaughton [Fri, 7 Jan 2022 01:39:04 +0000 (14:39 +1300)]
Merge pull request #22394 from eileenmcnaughton/return
Ensure getDuplicateContacts always returns an array
Eileen McNaughton [Fri, 7 Jan 2022 01:23:00 +0000 (14:23 +1300)]
[REF] Remove unused variable
Eileen McNaughton [Fri, 7 Jan 2022 00:49:17 +0000 (13:49 +1300)]
Remove unnecessary pass-by-ref
Eileen McNaughton [Fri, 7 Jan 2022 00:08:26 +0000 (13:08 +1300)]
Ensure getDuplicateContacts always returns an array
Calling code already handles an empty array as that is what it would receive - unless the hook set it to NULL
Eileen McNaughton [Thu, 6 Jan 2022 23:58:53 +0000 (12:58 +1300)]
Remove unnecessary pass-by-ref
Eileen McNaughton [Thu, 6 Jan 2022 23:56:20 +0000 (12:56 +1300)]
Privatise function
Eileen McNaughton [Thu, 6 Jan 2022 23:38:56 +0000 (12:38 +1300)]
Merge pull request #22389 from colemanw/contactTypes
REF - Use `CRM_Contact_BAO_ContactType::basicTypes()` instead of hardcoded lists
Eileen McNaughton [Thu, 6 Jan 2022 20:52:17 +0000 (09:52 +1300)]
[REF] Remove handling for relationshipID
We can see that the only call to this function does not set params['id'] & hence it is NULL
Eileen McNaughton [Thu, 6 Jan 2022 23:13:10 +0000 (12:13 +1300)]
Merge pull request #22383 from colemanw/dedupeRuleScreenFixes
DedupeRules - Translate contact type labels, respect enabled contact types
colemanw [Thu, 6 Jan 2022 23:08:20 +0000 (18:08 -0500)]
Merge pull request #22390 from eileenmcnaughton/legacy2
[REF] Further cleanup on employer create
colemanw [Thu, 6 Jan 2022 23:05:03 +0000 (18:05 -0500)]
Merge pull request #22319 from colemanw/afformSearchFilters
Afform - UI and contextual titles for search displays
colemanw [Thu, 6 Jan 2022 23:01:39 +0000 (18:01 -0500)]
Merge pull request #22323 from eileenmcnaughton/taxterm
Smarty modifier - stop using isset to check taxTerm
Seamus Lee [Thu, 6 Jan 2022 23:01:17 +0000 (10:01 +1100)]
Merge pull request #21178 from eileenmcnaughton/perm
dev/core#2752 Allow financial_trxns to be viewed
Eileen McNaughton [Thu, 6 Jan 2022 20:49:12 +0000 (09:49 +1300)]
[REF] Simplify handing of ids
Rather than compile contactID into an array to pass it in pass as itself. It is then
clear that ids['relationship'] will always be null - so remove the check
Coleman Watts [Thu, 6 Jan 2022 17:17:29 +0000 (12:17 -0500)]
REF - Use `CRM_Contact_BAO_ContactType::basicTypes()` instead of hardcoded lists
Makes code more flexible/forgiving if new contact types are added in the future,
or if existing contact types are disabled.
colemanw [Thu, 6 Jan 2022 18:40:38 +0000 (13:40 -0500)]
Merge pull request #22388 from colemanw/unusedFunctionDel
Remove unused function
Coleman Watts [Thu, 6 Jan 2022 17:04:02 +0000 (12:04 -0500)]
Remove unused function
Eileen McNaughton [Thu, 6 Jan 2022 02:26:07 +0000 (15:26 +1300)]
Duplicate legacyCreateMultiple to contact_utils
Having a lot of trouble fixing a bug via this method so gonn break up & clean up the function in this context
(leaves on the import class & a JMA extension calling it.
colemanw [Wed, 5 Jan 2022 18:50:00 +0000 (13:50 -0500)]
Merge pull request #22369 from braders/dedupeRulesSystemCheck
Add system status check for missing dedupe rules