Eileen McNaughton [Mon, 3 Apr 2023 23:47:07 +0000 (11:47 +1200)]
[TESTS] Fix some campaign cleanup
colemanw [Mon, 3 Apr 2023 00:45:11 +0000 (20:45 -0400)]
Merge pull request #25979 from eileenmcnaughton/civi_import_notice_fix
Fix enotice when using Civi-import
colemanw [Mon, 3 Apr 2023 00:43:29 +0000 (20:43 -0400)]
Merge pull request #25939 from eileenmcnaughton/template_search
Civi-Import - Add Template search
Eileen McNaughton [Mon, 3 Apr 2023 00:07:03 +0000 (12:07 +1200)]
Merge pull request #25971 from colemanw/acitivityCruft
Activity BAO - Remove unused classes/functions
Eileen McNaughton [Sun, 2 Apr 2023 23:53:02 +0000 (11:53 +1200)]
Merge pull request #25973 from colemanw/savedSearchUpdate
BAO - deprecate create for writeRecord: SavedSearch
Eileen McNaughton [Sun, 2 Apr 2023 23:52:13 +0000 (11:52 +1200)]
Merge pull request #25976 from colemanw/deprecateSetIsActive
BAO - Deprecate `setIsActive` BAO functions
Eileen McNaughton [Sun, 2 Apr 2023 23:47:52 +0000 (11:47 +1200)]
Merge pull request #25986 from civicrm/5.60
5.60
colemanw [Sun, 2 Apr 2023 23:19:52 +0000 (19:19 -0400)]
Merge pull request #25977 from eileenmcnaughton/import_edit_cond
Civi-Import - improvements to the search display for imported rows
colemanw [Sun, 2 Apr 2023 23:18:23 +0000 (19:18 -0400)]
Merge pull request #25980 from eileenmcnaughton/import_js
Minor fixes to Civi-Import screen, populating defaults, missing `ts`
demeritcowboy [Sun, 2 Apr 2023 23:01:11 +0000 (19:01 -0400)]
Merge pull request #25981 from eileenmcnaughton/560
Fix error when importing a soft credit AND a note when currency not provided
Eileen McNaughton [Sun, 2 Apr 2023 22:45:09 +0000 (10:45 +1200)]
Merge pull request #25985 from civicrm/5.60
5.60 to master
Eileen McNaughton [Sun, 2 Apr 2023 22:11:03 +0000 (10:11 +1200)]
Merge pull request #25982 from demeritcowboy/fileoncase
dev/core#4217 - Fix file on case search by id and broken entityref pagination
Eileen McNaughton [Sun, 2 Apr 2023 21:55:20 +0000 (09:55 +1200)]
Merge pull request #25983 from demeritcowboy/casejson
[NFC] Don't have null values for required fields in Case test fixture
Eileen McNaughton [Sun, 2 Apr 2023 21:51:13 +0000 (09:51 +1200)]
Extend Generic\CheckAccess to reduce boilerplate
Eileen McNaughton [Sun, 2 Apr 2023 07:04:30 +0000 (19:04 +1200)]
Minor fixes to Civi-Import screen, populating defaults, missing ts
Coleman Watts [Sun, 2 Apr 2023 00:38:51 +0000 (20:38 -0400)]
BAO - Deprecate setIsActive BAO functions
demeritcowboy [Sun, 2 Apr 2023 19:20:30 +0000 (15:20 -0400)]
don't be null
demeritcowboy [Sun, 2 Apr 2023 19:17:26 +0000 (15:17 -0400)]
add test
demeritcowboy [Sun, 2 Apr 2023 17:28:19 +0000 (13:28 -0400)]
fix file on case search by id and broken pagination
Eileen McNaughton [Sun, 2 Apr 2023 07:18:24 +0000 (19:18 +1200)]
Fix error when importing a soft credit AND a note when currency not provided
Eileen McNaughton [Sun, 2 Apr 2023 04:36:32 +0000 (16:36 +1200)]
Fix enotice when using Civi-import
Eileen McNaughton [Sun, 2 Apr 2023 04:10:18 +0000 (16:10 +1200)]
Merge pull request #25974 from colemanw/updateSubHistory
BAO - deprecate create for writeRecord: SubscriptionHistory
Eileen McNaughton [Sun, 2 Apr 2023 03:33:22 +0000 (15:33 +1200)]
Merge pull request #25978 from civicrm/5.60
5.60 to master
Eileen McNaughton [Sun, 2 Apr 2023 03:31:18 +0000 (15:31 +1200)]
Merge pull request #25967 from alifrumin/5.60rn
[NFC] 5.60 release notes
Eileen McNaughton [Sun, 2 Apr 2023 03:30:51 +0000 (15:30 +1200)]
Merge pull request #25970 from colemanw/aclWriteRecord
BAO - deprecate create for writeRecord: ACL
Eileen McNaughton [Sun, 2 Apr 2023 03:29:10 +0000 (15:29 +1200)]
Merge pull request #25975 from colemanw/factory
Demolish the factory 🏭💥
Eileen McNaughton [Sun, 2 Apr 2023 03:19:23 +0000 (15:19 +1200)]
Move entity_id before status_message
Eileen McNaughton [Sun, 2 Apr 2023 02:48:29 +0000 (14:48 +1200)]
Removed edit-in-place options from Import views on imported rows.
It's confusing to the user to be able to edit the records when they
are already imported. This is not a real security thing - more
of a UI thing - but Coleman recommends implementing through
checkAccess. I did leave open the back door of being able to edit it
if the status is now present as there isn't a real reason they shouldn't -
just that it is confusing to present edit-in-place, except when they could
edit & re-try the import
Eileen McNaughton [Sun, 2 Apr 2023 03:12:08 +0000 (15:12 +1200)]
Merge pull request #25969 from colemanw/entityValues
SearchKit - Pass entire record into `checkAccess`
Eileen McNaughton [Sun, 2 Apr 2023 02:43:28 +0000 (14:43 +1200)]
Merge pull request #25972 from colemanw/batchUpdate
BAO - deprecate create for writeRecord: Batch
Coleman Watts [Sat, 1 Apr 2023 23:58:49 +0000 (19:58 -0400)]
Remove unused CRM_Contact_DAO_Factory
Coleman Watts [Sat, 1 Apr 2023 23:50:11 +0000 (19:50 -0400)]
BAO - deprecate create for writeRecord: SubscriptionHistory
Coleman Watts [Sat, 1 Apr 2023 23:44:20 +0000 (19:44 -0400)]
BAO - deprecate create for writeRecord: SavedSearch
Coleman Watts [Sat, 1 Apr 2023 23:31:53 +0000 (19:31 -0400)]
BAO - deprecate create for writeRecord: Batch
Coleman Watts [Sat, 1 Apr 2023 20:52:45 +0000 (16:52 -0400)]
Activity BAO - Remove unused classes/functions
Coleman Watts [Sat, 1 Apr 2023 20:32:11 +0000 (16:32 -0400)]
BAO - deprecate create for writeRecord: ACL
Coleman Watts [Sat, 1 Apr 2023 15:15:22 +0000 (11:15 -0400)]
SearchKit - Pass entire record into `checkAccess`
For efficiency it's best to pass all available data into the `checkAccess` action to avoid unnecessary
db lookups. This ensures the full record is passed in when checking access before enabling in-place edit.
Seamus Lee [Fri, 31 Mar 2023 23:28:30 +0000 (10:28 +1100)]
Merge pull request #25956 from totten/master-tap
(dev/core#4188) PHPUnit - Port TAP printer to v9.x
Alice Frumin [Fri, 10 Mar 2023 02:52:02 +0000 (21:52 -0500)]
[NFC] 5.56 release notes first pass
Matthew Wire [Fri, 31 Mar 2023 10:26:56 +0000 (11:26 +0100)]
Merge pull request #25965 from eileenmcnaughton/dep_tax
Remove noisily deprecated code
Eileen McNaughton [Fri, 31 Mar 2023 01:46:52 +0000 (14:46 +1300)]
Merge pull request #25966 from civicrm/5.60
5.60 to master
Eileen McNaughton [Fri, 31 Mar 2023 01:39:08 +0000 (14:39 +1300)]
Merge pull request #25963 from seamuslee001/dev_core_4029
dev/core#4029 Ensure that Pan Truncation and card type id is recorded…
Eileen McNaughton [Fri, 31 Mar 2023 01:36:24 +0000 (14:36 +1300)]
Merge pull request #25964 from eileenmcnaughton/mem_regress
Fix master-only regression on loading membership changes
Eileen McNaughton [Fri, 31 Mar 2023 01:11:36 +0000 (14:11 +1300)]
Remove noisily deprecated code
Eileen McNaughton [Fri, 31 Mar 2023 00:50:36 +0000 (13:50 +1300)]
Fix master-only regression on loading membership changes
A recent commit caused _mid to be set to FALSE to denote
it had been looked up & was empty (as opposed to not yet checked)
but these places are using isset.
The change fixes them all to call the function.
Seamus Lee [Thu, 30 Mar 2023 23:22:21 +0000 (10:22 +1100)]
Merge pull request #25962 from eileenmcnaughton/import_url
Upgrade fix for url change
Seamus Lee [Thu, 30 Mar 2023 22:07:23 +0000 (09:07 +1100)]
dev/core#4029 Ensure that Pan Truncation and card type id is recorded when processing front end contributions
Eileen McNaughton [Thu, 30 Mar 2023 20:45:40 +0000 (09:45 +1300)]
Upgrade fix for url change
Tim Otten [Thu, 30 Mar 2023 20:26:18 +0000 (13:26 -0700)]
Merge pull request #25952 from seamuslee001/dev_core_3133
dev/core#3133 - Extend Authx functionality to support validation of e…
demeritcowboy [Thu, 30 Mar 2023 18:31:13 +0000 (14:31 -0400)]
Merge pull request #25958 from colemanw/javascript
CustomFields - drop unused 'javascript' column
Mathieu Lu [Thu, 30 Mar 2023 14:32:54 +0000 (10:32 -0400)]
Merge pull request #25953 from demeritcowboy/too-loggy
Duplicate logging not needed for PEAR_Errors anymore
colemanw [Thu, 30 Mar 2023 12:26:51 +0000 (08:26 -0400)]
Merge pull request #25955 from colemanw/groupEdit
Manage groups - add dedicated url for edit/delete group
colemanw [Thu, 30 Mar 2023 12:03:53 +0000 (08:03 -0400)]
Merge pull request #25944 from colemanw/writeRecordRef
[REF] Refactor location-related BAOs to use `writeRecord`
colemanw [Thu, 30 Mar 2023 10:53:35 +0000 (06:53 -0400)]
Merge pull request #25959 from eileenmcnaughton/import_links
Flush cache that holds schema links information when saving UserJob
Coleman Watts [Thu, 30 Mar 2023 00:45:53 +0000 (20:45 -0400)]
Manage groups - add dedicated url for edit/delete group
Tim Otten [Thu, 30 Mar 2023 04:47:34 +0000 (21:47 -0700)]
Merge pull request #25957 from eileenmcnaughton/import_template
Import templates Set created_id, expires_date appropriately
Eileen McNaughton [Thu, 30 Mar 2023 04:12:13 +0000 (17:12 +1300)]
Flush cache that holds schema links information when saving UserJob
Coleman Watts [Thu, 30 Mar 2023 03:08:49 +0000 (23:08 -0400)]
CustomFields - drop unused 'javascript' column
Eileen McNaughton [Thu, 30 Mar 2023 03:06:13 +0000 (16:06 +1300)]
Import templates Set created_id, expires_date appropriately
This tweaks just-merged userJob functionality.
When creating an import job it is not correct to use
the created_id or expires_date from the template - but
these should be set appropriately, rather than left blank
Eileen McNaughton [Thu, 30 Mar 2023 02:54:44 +0000 (15:54 +1300)]
Make sure search_kit is installed first
Eileen McNaughton [Wed, 22 Mar 2023 08:15:32 +0000 (21:15 +1300)]
Add Template search
Tim Otten [Thu, 30 Mar 2023 01:36:34 +0000 (18:36 -0700)]
tools/scripts/phpunit - Enable tap for phpunit9
Tim Otten [Thu, 30 Mar 2023 01:30:29 +0000 (18:30 -0700)]
Testing - Port TAP printer to PHPUnit 9
Tim Otten [Thu, 30 Mar 2023 01:17:55 +0000 (18:17 -0700)]
(REF) Testing - Extract class-file "TAP7"
Coleman Watts [Tue, 28 Mar 2023 14:25:01 +0000 (10:25 -0400)]
BAO - Refactor Address add/create to use writeRecord
Coleman Watts [Tue, 28 Mar 2023 13:13:33 +0000 (09:13 -0400)]
BAO - Deprecate email/im/phone/website/openId create/add functions in favor of writeRecord
Eileen McNaughton [Wed, 29 Mar 2023 21:57:45 +0000 (10:57 +1300)]
Merge pull request #25954 from demeritcowboy/case-dashboard-recent
dev/core#3804 - Fix recently performed activities on case dashboard when no upcoming exist
demeritcowboy [Wed, 29 Mar 2023 21:11:46 +0000 (17:11 -0400)]
fix recently performed activities on case dashboard
demeritcowboy [Wed, 29 Mar 2023 20:15:01 +0000 (16:15 -0400)]
Merge pull request #25917 from eileenmcnaughton/smarty_pcp
Check presence of field, rather than extra smarty variable for whether to display the field
Eileen McNaughton [Sat, 25 Mar 2023 01:08:00 +0000 (14:08 +1300)]
Check presence of field, rather than extra smarty variable for whether to display the field
demeritcowboy [Wed, 29 Mar 2023 19:19:34 +0000 (15:19 -0400)]
Merge pull request #25906 from herbdool/issue-4200
dev/core#4200 use org ID rather than assume it
demeritcowboy [Wed, 29 Mar 2023 15:35:58 +0000 (11:35 -0400)]
logging not needed here anymore - still gets logged later if not caught
Yashodha Chaku [Wed, 29 Mar 2023 09:20:07 +0000 (14:50 +0530)]
Merge pull request #25726 from ixiam/devCrmMoneyLocale
add locale param to smarty crmMoney()
Tim Otten [Wed, 29 Mar 2023 05:35:10 +0000 (22:35 -0700)]
authx - Simplify service declaration
Anthony [Thu, 24 Mar 2022 04:29:44 +0000 (12:29 +0800)]
dev/core#3133 - Extend Authx functionality to support validation of externally generated JWTs
Migrate legacy rest to appropriate place
Remove legacy auth as not needed due to it self registering now
Eileen McNaughton [Wed, 29 Mar 2023 01:21:32 +0000 (14:21 +1300)]
Merge pull request #25951 from civicrm/5.60
5.60 to master
Eileen McNaughton [Wed, 29 Mar 2023 01:21:03 +0000 (14:21 +1300)]
Merge pull request #25950 from demeritcowboy/upgrade-fk
Make 5.60 upgrade rerunnable
demeritcowboy [Wed, 29 Mar 2023 00:27:54 +0000 (20:27 -0400)]
make upgrade rerunnable
Eileen McNaughton [Wed, 29 Mar 2023 00:26:05 +0000 (13:26 +1300)]
Merge pull request #25946 from totten/master-phpunit9
(dev/core#4188) phpunit.xml.dist - Make file compatible with phpunit8 + phpunit9
Seamus Lee [Wed, 29 Mar 2023 00:23:17 +0000 (11:23 +1100)]
Merge pull request #25949 from totten/master-phpunit9-crm
(dev/core#4188) Update CRM tests for phpunit9 compatibility
Seamus Lee [Wed, 29 Mar 2023 00:23:01 +0000 (11:23 +1100)]
Merge pull request #25948 from totten/master-phpunit9-api3
(dev/core#4188) Update APIv3 tests for phpunit9 compatibility
Seamus Lee [Wed, 29 Mar 2023 00:20:53 +0000 (11:20 +1100)]
Merge pull request #25947 from totten/master-phpunit9-api4
(dev/core#4188) Update APIv4 tests for phpunit9 compatibility
Tim Otten [Tue, 28 Mar 2023 23:47:30 +0000 (16:47 -0700)]
(dev/core#4188) Update CRM tests for phpunit9 compatibility
Tim Otten [Tue, 28 Mar 2023 23:42:21 +0000 (16:42 -0700)]
(dev/core#4188) Update APIv3 tests for phpunit9 compatibility
These tests failed on `phpunit9` because upstream swapped out around the semantics of `assertContains()`.
The specific issue is whether an array like `["1","2","3"]` contains the value `2`.
* `assertContains()` in phpunit8 says yes.
* `assertContains()` in phpunit9 says no.
* `assertContainsEquals()` in both phpunit8+phpunit9 says yes.
Tim Otten [Tue, 28 Mar 2023 23:02:01 +0000 (16:02 -0700)]
(dev/core#4188) Update APIv4 tests for phpunit9 compatibility
These tests failed on `phpunit9` because upstream swapped out around the semantics of `assertContains()`.
The specific issue is whether an array like `["1","2","3"]` contains the value `2`.
* `assertContains()` in phpunit8 says yes.
* `assertContains()` in phpunit9 says no.
* `assertContainsEquals()` in both phpunit8+phpunit9 says yes.
Tim Otten [Tue, 28 Mar 2023 22:28:26 +0000 (15:28 -0700)]
phpunit.xml.dist - Make file compatible with phpunit8 + phpunit9
Eileen McNaughton [Tue, 28 Mar 2023 20:28:33 +0000 (09:28 +1300)]
Merge pull request #25873 from colemanw/ppUpdate
PaymentProcessor - Enter title instead of name on form, call hooks
Eileen McNaughton [Tue, 28 Mar 2023 04:01:56 +0000 (17:01 +1300)]
PHP 8.2 - declare property _fields
Really we want to merge this into entityFields but it wasn't as easy as I hoped
Eileen McNaughton [Tue, 28 Mar 2023 03:59:38 +0000 (16:59 +1300)]
Fix incorrect redirect when saving with bad config
Since the config is checked after saving we want to go to the
edit form, not the new form
Eileen McNaughton [Fri, 24 Mar 2023 02:28:47 +0000 (15:28 +1300)]
Fix form to stop messing name field for test processor
Eileen McNaughton [Tue, 28 Mar 2023 01:20:05 +0000 (14:20 +1300)]
Consolidate loading parameters from PaymentProcessorType
Eileen McNaughton [Tue, 28 Mar 2023 01:29:09 +0000 (14:29 +1300)]
Present frontend_title for Payment processor
Coleman Watts [Sun, 19 Mar 2023 23:55:54 +0000 (19:55 -0400)]
PaymentProecssor - Add frontend_title & make title required
Clarifies the role of 'title' as "for admins" and adds a new "frontend_title" for end-users.
Updates the PaymentProcessor form/dao to use hooks instead of an overloaded "create" function,
and only allows the title and frontend_title instead of the name to be entered on the form.
The name will be autogenerated from the title in the DAO::writeRecord function.
The frontend_title is required in the database but will be filled from `title` if not supplied during `create`
Updates tests, sql and sample data with required field
colemanw [Tue, 28 Mar 2023 15:10:31 +0000 (11:10 -0400)]
Merge pull request #25927 from colemanw/entityRefFix
SearchKit - Fix handling of new Custom EntityReference fields
colemanw [Tue, 28 Mar 2023 12:36:54 +0000 (08:36 -0400)]
Merge pull request #25937 from colemanw/emailWriteRecord
Refactor CRM_Core_BAO_Email to use DAO::writeRecord
Yashodha Chaku [Tue, 28 Mar 2023 12:32:02 +0000 (18:02 +0530)]
Merge pull request #25933 from mlutfy/logReminders
Log sending of Scheduled Reminders
Seamus Lee [Tue, 28 Mar 2023 07:31:22 +0000 (18:31 +1100)]
Merge pull request #25941 from eileenmcnaughton/nfc_null
[NFC] Remove extraneous NULL
Tim Otten [Tue, 28 Mar 2023 07:06:23 +0000 (00:06 -0700)]
Merge pull request #25943 from totten/master-mfw
Merge forward 5.60-rc=>master
Tim Otten [Tue, 28 Mar 2023 06:54:07 +0000 (23:54 -0700)]
Merge remote-tracking branch 'origin/5.60' into master-mfw
Tim Otten [Tue, 28 Mar 2023 06:52:09 +0000 (23:52 -0700)]
Merge pull request #25942 from totten/5.60-cache-test
Simplify steps of loading SimpleCacheTest from cache/integration-tests