olayiwola-compucorp [Thu, 4 Jan 2024 12:46:36 +0000 (13:46 +0100)]
Support creating payment methods that can be hidden from user
Eileen McNaughton [Thu, 4 Jan 2024 09:07:29 +0000 (22:07 +1300)]
Merge pull request #28874 from eileenmcnaughton/port
Ensure auto renew is set on Membership price set
Jitendra Purohit [Thu, 4 Jan 2024 06:26:52 +0000 (11:56 +0530)]
Ensure auto renew is set on Membership price set
Eileen McNaughton [Thu, 4 Jan 2024 05:37:06 +0000 (18:37 +1300)]
Merge pull request #28863 from eileenmcnaughton/logging_detail
Add system check to warn if CiviReport disabled & logging enabled
Eileen McNaughton [Thu, 4 Jan 2024 05:18:57 +0000 (18:18 +1300)]
Merge pull request #28868 from civicrm/5.69
5.69 to master
Eileen McNaughton [Thu, 4 Jan 2024 04:48:40 +0000 (17:48 +1300)]
Merge pull request #28867 from eileenmcnaughton/report_move
Move report test to civi_report
eileen [Thu, 4 Jan 2024 01:02:26 +0000 (14:02 +1300)]
Add system check to warn if CiviReport disabled & logging enabled
Tim Otten [Thu, 4 Jan 2024 03:44:55 +0000 (21:44 -0600)]
Merge pull request #28722 from eileenmcnaughton/auto_renew
CiviMember - Fix checkbox for optional auto-renewals
eileen [Thu, 4 Jan 2024 03:29:26 +0000 (16:29 +1300)]
Move report test to civi_report
Eileen McNaughton [Thu, 4 Jan 2024 03:38:08 +0000 (16:38 +1300)]
Merge pull request #28866 from eileenmcnaughton/report_instance
Minor cleanup in ReportInstance BAO
Seamus Lee [Thu, 4 Jan 2024 03:23:55 +0000 (14:23 +1100)]
Merge pull request #28641 from colemanw/fullScreenDashlet
Dashboard Fullscreen dashlet improvements
Eileen McNaughton [Thu, 4 Jan 2024 03:21:58 +0000 (16:21 +1300)]
Merge pull request #28865 from civicrm/5.69
5.69
Eileen McNaughton [Thu, 4 Jan 2024 03:15:52 +0000 (16:15 +1300)]
Merge pull request #28860 from colemanw/deprecateDate
CoreForm - Add noisy deprecation to addDate & addDateTime functions
colemanw [Thu, 4 Jan 2024 02:47:34 +0000 (21:47 -0500)]
Merge pull request #28861 from seamuslee001/grant_report_recieved_fixed
[REF] Fix grant_report_received column to be not null and default to 0
colemanw [Thu, 4 Jan 2024 02:29:05 +0000 (21:29 -0500)]
Merge pull request #28769 from eileenmcnaughton/amountu
Declare amount private - use magic method to provide access to the old value
Seamus Lee [Thu, 4 Jan 2024 02:25:56 +0000 (13:25 +1100)]
Merge pull request #28850 from colemanw/fkColumn
APIv4 - Add fk_column to getFields metadata
Seamus Lee [Thu, 4 Jan 2024 02:25:44 +0000 (13:25 +1100)]
Merge pull request #28862 from seamuslee001/grant_search_notices
[REF] Fix Smarty Notices on Find Grants search
eileen [Thu, 4 Jan 2024 02:14:19 +0000 (15:14 +1300)]
Minor cleanup in ReportInstance BAO
Seamus Lee [Thu, 4 Jan 2024 02:09:14 +0000 (13:09 +1100)]
Merge pull request #28848 from eileenmcnaughton/notice
Fix notice in workflow message examples when no price set present
colemanw [Thu, 4 Jan 2024 01:52:03 +0000 (20:52 -0500)]
Merge pull request #28847 from eileenmcnaughton/date_non_us_time_2
Fix time handling for dd_mon_yy format date strings
Seamus Lee [Thu, 4 Jan 2024 01:03:58 +0000 (12:03 +1100)]
[REF] Fix grant_report_received column to be not null and default to 0
Fix form handling
colemanw [Wed, 3 Jan 2024 14:15:00 +0000 (09:15 -0500)]
APIv4 - Add fk_column to getFields metadata
Before: getFields contained incomplete info about foreign keys, so trying to map the schema was unnecessarily difficult.
After: No need to use extra DAO methods like getReferenceColumns() to find out about FKs. All the info is returned by getFields.
Seamus Lee [Thu, 4 Jan 2024 01:11:07 +0000 (12:11 +1100)]
[REF] Fix Smarty Notices on Find Grants search
colemanw [Thu, 4 Jan 2024 00:57:52 +0000 (19:57 -0500)]
CoreForm - Add noisy deprecation to addDate & addDateTime functions
Eileen McNaughton [Thu, 4 Jan 2024 00:53:43 +0000 (13:53 +1300)]
Merge pull request #28859 from eileenmcnaughton/table
Fix notice on civi-report display
Tim Otten [Thu, 4 Jan 2024 00:53:20 +0000 (18:53 -0600)]
Merge pull request #28819 from eileenmcnaughton/no_line
(dev/core#4877) CiviContribute - Re-calculate prices when using "Go Back"
Tim Otten [Thu, 4 Jan 2024 00:52:51 +0000 (18:52 -0600)]
Merge pull request #28820 from eileenmcnaughton/amount
CiviContribute - Do not delete price_set_entity record while page supports payment
colemanw [Thu, 4 Jan 2024 00:50:18 +0000 (19:50 -0500)]
Merge pull request #28858 from eileenmcnaughton/no_array
dev/core#4881 Do not fatal if params is not an array
eileen [Thu, 4 Jan 2024 00:11:23 +0000 (13:11 +1300)]
Fix notice on civi-report display
Tim Otten [Wed, 3 Jan 2024 23:48:11 +0000 (17:48 -0600)]
Merge pull request #28757 from totten/master-oauth2-google
(dev/core#3581) composer.json - Allow newer version of oauth2-google
eileen [Mon, 1 Jan 2024 03:06:45 +0000 (16:06 +1300)]
Reload submitted line items on re-submit of Main form
Tim Otten [Thu, 21 Dec 2023 19:12:00 +0000 (11:12 -0800)]
(dev/core#3581) composer.json - Allow newer version of oauth2-google
I looked at the diffs for v3.0.4 and 4.0.0.
* They raised the requirements to PHP 7.3/8.0 and added some type-hints.
* They raised the test-env to PHPUnit 8/9
* They updated some metadata to say all that.
* The main contracts are provided by `league/oauth2-client` -- which
hasn't changed. It's still the same v2.x requirement.
* I don't believe that Civi directly extends/overrides any of the Google Auth stuff.
Eileen McNaughton [Wed, 3 Jan 2024 22:25:25 +0000 (11:25 +1300)]
Merge pull request #28519 from MegaphoneJon/pcp-enumerate
[REF] Rewrite PCP enumeration to avoid caching bug
eileen [Wed, 3 Jan 2024 21:39:05 +0000 (10:39 +1300)]
Do not fatal if params is not an array
Eileen McNaughton [Tue, 19 Dec 2023 21:56:52 +0000 (10:56 +1300)]
Fix autorenew checkbox with memberships
Eileen McNaughton [Wed, 3 Jan 2024 19:36:44 +0000 (08:36 +1300)]
Merge pull request #28854 from alifrumin/5.69lc
[NFC] 5.69 release note late changes
Eileen McNaughton [Wed, 3 Jan 2024 19:29:06 +0000 (08:29 +1300)]
Merge pull request #28857 from civicrm/5.69
5.69 to master
Eileen McNaughton [Wed, 3 Jan 2024 19:28:38 +0000 (08:28 +1300)]
Merge pull request #28856 from eileenmcnaughton/569
Correct jcalendar.tpl
Stephen Palmstrom [Wed, 3 Jan 2024 17:37:29 +0000 (17:37 +0000)]
Correct jcalendar.tpl
Eileen McNaughton [Wed, 3 Jan 2024 19:23:28 +0000 (08:23 +1300)]
Merge pull request #28851 from colemanw/ruleGroupTestCleanup
[NFC] Cleanup dummy DAO in ruleGroupTest class
Rich Lott [Wed, 3 Jan 2024 18:09:29 +0000 (18:09 +0000)]
Merge pull request #28852 from colemanw/checkAccessHelp
[NFC] Fix docblock reference in _checkAccess functions
Alice Frumin [Wed, 3 Jan 2024 16:26:55 +0000 (11:26 -0500)]
[NFC] 5.69 release note late changes
colemanw [Wed, 3 Jan 2024 14:50:05 +0000 (09:50 -0500)]
Merge pull request #28540 from twomice/3912_sk_manage_premiums
Add "Manage Premiums" to AdminUI, toward dev/core#3912 .
colemanw [Wed, 3 Jan 2024 14:42:04 +0000 (09:42 -0500)]
Fix docblock reference in _checkAccess functions
colemanw [Wed, 3 Jan 2024 14:35:26 +0000 (09:35 -0500)]
Cleanup dummy DAO in ruleGroupTest class
The getReferenceColumns() is no longer needed and can just use the parent function.
colemanw [Wed, 3 Jan 2024 14:05:39 +0000 (09:05 -0500)]
Update preview path in Product.xml
Seamus Lee [Wed, 3 Jan 2024 07:28:51 +0000 (18:28 +1100)]
Merge pull request #28849 from eileenmcnaughton/test_clean
Minor cleanup in test class
eileen [Wed, 3 Jan 2024 00:47:56 +0000 (13:47 +1300)]
Fix time handling for dd_mon_yy format
eileen [Wed, 3 Jan 2024 05:35:23 +0000 (18:35 +1300)]
Standardise processor set up, variable usage
eileen [Wed, 3 Jan 2024 05:20:14 +0000 (18:20 +1300)]
Minor cleanup in test class
eileen [Wed, 3 Jan 2024 04:45:21 +0000 (17:45 +1300)]
Fix notice in workflow messages when no price set present
eileen [Tue, 2 Jan 2024 02:58:45 +0000 (15:58 +1300)]
Handle time in dd_mm_yyyy format
Eileen McNaughton [Wed, 3 Jan 2024 03:14:01 +0000 (16:14 +1300)]
Merge pull request #28846 from colemanw/extReferenceColumns
Regenerate ext DAO files using updated civix
Eileen McNaughton [Wed, 3 Jan 2024 02:39:26 +0000 (15:39 +1300)]
Merge pull request #28844 from eileenmcnaughton/date_non_us
Fix handling of non-padded day in import date in dd/mm/yyy format
colemanw [Wed, 3 Jan 2024 02:07:26 +0000 (21:07 -0500)]
Regenerate ext DAO files using updated civix
Uses the update from https://github.com/totten/civix/pull/328 to add FKColumnName metadata.
Eileen McNaughton [Wed, 3 Jan 2024 00:34:29 +0000 (13:34 +1300)]
Merge pull request #28843 from civicrm/5.69
5.69
Eileen McNaughton [Wed, 3 Jan 2024 00:22:19 +0000 (13:22 +1300)]
Merge pull request #28827 from colemanw/getReferenceColumns
DAO - Return reference columns based on field metadata
eileen [Tue, 2 Jan 2024 02:39:50 +0000 (15:39 +1300)]
Fix handling of non-padded month in dd_mon_YY format
eileen [Tue, 2 Jan 2024 01:48:03 +0000 (14:48 +1300)]
Fix time handling for us-style
Add consistent time-format support for US formats, add test for our magic year-handling
Seamus Lee [Tue, 2 Jan 2024 23:52:41 +0000 (10:52 +1100)]
Merge pull request #28842 from MegaphoneJon/price-field-weights
Price field and value weights not respected
Eileen McNaughton [Tue, 2 Jan 2024 23:23:52 +0000 (12:23 +1300)]
Merge pull request #28647 from eileenmcnaughton/delete
Move implementation of financial type acl out of core (leverage existing extension hooks)
Jon Goldberg [Tue, 2 Jan 2024 22:33:27 +0000 (17:33 -0500)]
fix price field and value weights
Eileen McNaughton [Thu, 14 Dec 2023 07:20:25 +0000 (20:20 +1300)]
Remove duplicate check
Eileen McNaughton [Thu, 14 Dec 2023 07:19:44 +0000 (20:19 +1300)]
Do not call core function from extension
Eileen McNaughton [Thu, 14 Dec 2023 07:16:41 +0000 (20:16 +1300)]
Move financial type check from event register page
Eileen McNaughton [Thu, 14 Dec 2023 06:56:35 +0000 (19:56 +1300)]
Move link handling to extension
Eileen McNaughton [Thu, 14 Dec 2023 06:34:15 +0000 (19:34 +1300)]
Move check permissioned line items to acl now it is not used in core
Eileen McNaughton [Thu, 14 Dec 2023 06:09:39 +0000 (19:09 +1300)]
Move implementation of financial type acl out of core (leverage existing extension hooks)
Eileen McNaughton [Tue, 2 Jan 2024 21:47:54 +0000 (10:47 +1300)]
Merge pull request #28668 from colemanw/utilsArrayCollect
REF - Swap CRM_Utils_Array::collect with vanilla array_column
colemanw [Tue, 2 Jan 2024 21:31:55 +0000 (16:31 -0500)]
Merge pull request #28828 from eileenmcnaughton/date_iso
Fix time validation for iso date format
Eileen McNaughton [Tue, 2 Jan 2024 20:36:08 +0000 (09:36 +1300)]
Merge pull request #28834 from colemanw/phpStormGetLinks
[NFC] Add 'getLinks' action to phpStorm extension
Eileen McNaughton [Tue, 2 Jan 2024 20:26:25 +0000 (09:26 +1300)]
Merge pull request #28837 from colemanw/group_notice2
Fix e-notice on contact create for low-permissioned user
Tim Otten [Tue, 2 Jan 2024 19:17:36 +0000 (13:17 -0600)]
Merge pull request #28786 from colemanw/oauthLinks
dev/core#4674 - Add Oauth links for AdminUi MailSettings
colemanw [Tue, 2 Jan 2024 18:44:58 +0000 (13:44 -0500)]
Merge pull request #28838 from spalmstr/Issue_4879
Issue 4879 second attempt
Stephen Palmstrom [Tue, 2 Jan 2024 17:47:22 +0000 (17:47 +0000)]
Following suggested additional changes.
colemanw [Tue, 2 Jan 2024 15:08:53 +0000 (10:08 -0500)]
Fix e-notice on contact create for low-permissioned user
This cleans up some very messy code which was emitting e-notices when the 'group' key was missing.
This can happen when the current user does not have permissions to add contacts to groups.
Stephen Palmstrom [Tue, 2 Jan 2024 14:53:46 +0000 (14:53 +0000)]
Issue 4879
colemanw [Tue, 2 Jan 2024 14:48:58 +0000 (09:48 -0500)]
Merge pull request #28831 from eileenmcnaughton/template_vars_sample
Remove smarty2 functions from sample code
colemanw [Tue, 2 Jan 2024 14:35:56 +0000 (09:35 -0500)]
Merge pull request #28829 from eileenmcnaughton/template_vars
Use getTemplateVars in smarty help function
colemanw [Tue, 2 Jan 2024 14:33:42 +0000 (09:33 -0500)]
Merge pull request #28830 from eileenmcnaughton/template_smarty
Replace getTemplateVars() in test, assignTemplateVariables
colemanw [Tue, 2 Jan 2024 14:29:24 +0000 (09:29 -0500)]
Merge pull request #28621 from artfulrobot/issue-4857
standalone: implement cms-prefixed permissions as concrete ones
colemanw [Tue, 2 Jan 2024 14:18:53 +0000 (09:18 -0500)]
Merge pull request #28833 from artfulrobot/standaloneusers-dependency
Remove missingStandaloneExtension() checks which were pre-alpha scaffold
colemanw [Tue, 2 Jan 2024 14:02:25 +0000 (09:02 -0500)]
Add 'getLinks' action to phpStorm extension
Rich Lott / Artful Robot [Tue, 2 Jan 2024 12:43:18 +0000 (12:43 +0000)]
Remove missingStandaloneExtension() checks which were pre-alpha scaffold
Rich Lott [Tue, 2 Jan 2024 09:33:23 +0000 (09:33 +0000)]
Merge pull request #28784 from mlutfy/floatLeftButton
Merging as no objections
eileen [Tue, 2 Jan 2024 08:31:22 +0000 (21:31 +1300)]
Remove smarty2 functions from sample code
eileen [Tue, 2 Jan 2024 08:24:50 +0000 (21:24 +1300)]
Replace getTemplateVars() in test, assignTemplateVariables
eileen [Tue, 2 Jan 2024 07:56:58 +0000 (20:56 +1300)]
Use getTeplateVars in smarty help function
eileen [Tue, 2 Jan 2024 01:20:17 +0000 (14:20 +1300)]
Combine convertToDefaultDate back into only calling function
It is not a logical separation of concerns & makes code more complex
rather than simpler
eileen [Tue, 2 Jan 2024 01:06:13 +0000 (14:06 +1300)]
Fix time validation for iso date format
As this is a very simple format strtotime will get it right
so we just fix our validation & simplify
Eileen McNaughton [Tue, 2 Jan 2024 06:47:21 +0000 (19:47 +1300)]
Merge pull request #28826 from eileenmcnaughton/act_workflow
Use distinct test workflow message for workflow message tests
eileen [Tue, 2 Jan 2024 05:13:22 +0000 (18:13 +1300)]
Disable check temporily for PR juggling
colemanw [Sat, 23 Dec 2023 15:50:09 +0000 (10:50 -0500)]
dev/core#4674 - Add Oauth links for AdminUi MailSettings
This fixes https://lab.civicrm.org/dev/core/-/issues/4674 by adding a LinksProvider
for the new GetLinks action from #27973.
It uses the CRM_Core_BAO_MailSettings::getSetupActions() function to generate the extra links,
but there is a mismatch between the two functions:
- getSetupActions() returns a fully-formed url
- API::getLinks() returns a path
However, I noticed that while in theory hook_civicrm_mailSetupActions could return various urls,
in practice they are all the same: a generic civicrm/ajax/setupMailAccount redirect.
So this returns that as the path and it works.
Perhaps we should deprecate the option to return a url from hook_civicrm_mailSetupActions
(or just remove it, since it appears to be unused & YAGNI).
colemanw [Tue, 2 Jan 2024 04:30:12 +0000 (23:30 -0500)]
Regenerate Ext DAO files without boilerplate getReferenceColumns()
colemanw [Tue, 2 Jan 2024 04:25:47 +0000 (23:25 -0500)]
Regenerate Core DAO files without boilerplate getReferenceColumns()
colemanw [Tue, 2 Jan 2024 04:24:16 +0000 (23:24 -0500)]
DAO - Return reference columns based on field metadata
This deletes getReferenceColumns() from the DAO boilerplate and adds all the necessary field metadata
so that they can be generated by the parent class.
Eileen McNaughton [Tue, 2 Jan 2024 03:39:09 +0000 (16:39 +1300)]
Merge pull request #27973 from colemanw/getLinks
SearchKit - New getLinks API action for advanced link handling
colemanw [Tue, 2 Jan 2024 03:23:31 +0000 (22:23 -0500)]
Merge pull request #28789 from eileenmcnaughton/message_template
Update `MessageTemplates` generation to work with Smarty3
eileen [Tue, 2 Jan 2024 03:10:58 +0000 (16:10 +1300)]
Use distinct test workflow message for workflow message tests
The tests for the workflow message subsystem use an instance of a test
case_activity template attached the real message workflow template. They
test the text version - meaning that removing it, like we have with
others, causes various fails. In addition adding a real template that
does not match the test version causes mayhem.
In this case we want to ensure we keep all the tests for the subsystem
functionality but undo the tethering to a particular
template to allow that template to have updates without
having to go deep into this code
eileen [Tue, 2 Jan 2024 00:06:19 +0000 (13:06 +1300)]
Extract date regex validation