eileen [Mon, 2 Nov 2020 06:21:16 +0000 (19:21 +1300)]
dev/core#2159 Handle exceptions in Mail:send class
This adds handling for exceptions - allowing the class to be more effectivel swapped out
- need to think a bit more about the messages though
Eileen McNaughton [Thu, 10 Dec 2020 06:29:34 +0000 (19:29 +1300)]
Merge pull request #18855 from eileenmcnaughton/record
[REF] Simplify membership form code towards simplifying BAO
eileen [Mon, 26 Oct 2020 04:05:58 +0000 (17:05 +1300)]
[REF] Simplify membership form code towards simplifying BAO
On digging into the handling for the param relate_contribution_id in the BAO I found it is called
only from the membership form & it's really a hack for the way price sets were super-imposed on the form.
This has really solid testing in testTwoInheritedMembershipsViaPriceSetInBackend (Thanks @davejenx)
and stepping through there is the best way to make sense of it.
What is happening is that if there are 2 memberships in a price set Membership.create is called twice.
However, because the parameter contribution_status_id is passed in it attempts to create the contribution
twice. If we don't add this the second time then we wind up with the second membership payment not created
because that membership didn't exist the first round. So, an extra param relate_contribution_id got
added which says 'if this is passed in create the MembershipPayment record that didn't get created
the first time with the contribution id that we just did a lookup on.
All of this is needed because we create the contribution between the first Membership create
and the second. This removes both magic params from the create, and instead calls
recordMembershipContribution after both are done. I thought about calling Order.create or
just Contribution.create here but there is stuff to unravel around the soft credit creation
being done in RecordMembershipContribution and I am not yet clear if tests are adequate there
Seamus Lee [Thu, 10 Dec 2020 01:17:02 +0000 (12:17 +1100)]
Merge pull request #19154 from civicrm/5.33
5.33
Seamus Lee [Thu, 10 Dec 2020 00:22:58 +0000 (11:22 +1100)]
Merge pull request #19115 from totten/master-api4-perm
APIv4 - Add "Permission.get" for listing available permissions
Monish Deb [Thu, 10 Dec 2020 00:21:34 +0000 (05:51 +0530)]
Merge pull request #18794 from eileenmcnaughton/need_less
Membership BAO - do not require date fields to be passed in on update
Eileen McNaughton [Thu, 10 Dec 2020 00:15:17 +0000 (13:15 +1300)]
Merge pull request #19146 from JMAConsulting/issue-2174
core#2174: Activity Summary report is missing pagination
Seamus Lee [Wed, 9 Dec 2020 23:51:36 +0000 (10:51 +1100)]
Merge pull request #18838 from eileenmcnaughton/vrenew
dev/core#2024 extra line item issue on membership renewal
Seamus Lee [Wed, 9 Dec 2020 23:10:05 +0000 (10:10 +1100)]
Merge pull request #19120 from eileenmcnaughton/fee
Handle possibility of fee_amount = ''
Eileen McNaughton [Wed, 9 Dec 2020 22:49:06 +0000 (11:49 +1300)]
Merge pull request #19149 from seamuslee001/pager_notice_fix
Fix notice error on using max() with only one variable
Seamus Lee [Wed, 9 Dec 2020 22:45:59 +0000 (09:45 +1100)]
Merge pull request #19109 from eileenmcnaughton/cull
Remove extraneous handling duplicated from createProfileContact
Tim Otten [Fri, 4 Dec 2020 05:51:57 +0000 (21:51 -0800)]
Afform - Export list of synthetic permissions
Tim Otten [Fri, 4 Dec 2020 07:35:06 +0000 (23:35 -0800)]
APIv4 - Add "Permission.get" test. Include BD/D7/D8/WP variants.
Tim Otten [Fri, 4 Dec 2020 07:34:44 +0000 (23:34 -0800)]
APIv4 - Add "Permission.get" for browsing available permissions.
Tim Otten [Fri, 4 Dec 2020 07:05:25 +0000 (23:05 -0800)]
CRM_Core_Permission_* - Add getAvailablePermision(). Implement on BD/D7/D8/WP.
Eileen McNaughton [Wed, 9 Dec 2020 22:21:52 +0000 (11:21 +1300)]
Merge pull request #19153 from civicrm/5.33
5.33
Eileen McNaughton [Wed, 9 Dec 2020 20:44:19 +0000 (09:44 +1300)]
Merge pull request #19150 from colemanw/searchKitJoins
Search kit joins
eileen [Fri, 4 Dec 2020 02:33:21 +0000 (15:33 +1300)]
Remove extraneous handling duplicated from createProfileContact
I checked and tag and group are not available as import fields
While it's possible to add a contact to a group or tag them that is done elsewhere
- see
https://github.com/civicrm/civicrm-core/blob/
0a66a182969ae3fde9f8e54308c4a35fa415685b/CRM/Contact/Import/ImportJob.php#L248
Seamus Lee [Wed, 9 Dec 2020 19:18:23 +0000 (06:18 +1100)]
Merge pull request #19148 from civicrm/5.33
5.33
Seamus Lee [Wed, 9 Dec 2020 19:14:07 +0000 (06:14 +1100)]
Merge pull request #18995 from lucky091588/2199_ufgroup_pre_post_hook
Add pre() and post() hooks for ufgroup entity
Coleman Watts [Wed, 9 Dec 2020 15:08:43 +0000 (10:08 -0500)]
Search kit: bump version
Coleman Watts [Wed, 9 Dec 2020 14:27:16 +0000 (09:27 -0500)]
Search kit: Improve labels & relevance of smart group field selection
Coleman Watts [Wed, 9 Dec 2020 13:15:22 +0000 (08:15 -0500)]
Search kit: Display join name as part of default label
Seamus Lee [Wed, 9 Dec 2020 08:12:20 +0000 (19:12 +1100)]
Fix notice error on using max() with only one variable
Tim Otten [Wed, 9 Dec 2020 06:33:10 +0000 (22:33 -0800)]
Merge pull request #19125 from eileenmcnaughton/ev533
CiviEvent - Error registering participants via search task
Seamus Lee [Wed, 9 Dec 2020 04:16:21 +0000 (15:16 +1100)]
Merge pull request #19147 from civicrm/5.33
5.33
lucky091588 [Thu, 19 Nov 2020 13:47:13 +0000 (21:47 +0800)]
dev/core#2199: Add pre and post hooks for ufgroup entity
Monish Deb [Wed, 9 Dec 2020 02:05:49 +0000 (07:35 +0530)]
used separate query to fetch total count and renamed form variable totalRows
Seamus Lee [Wed, 9 Dec 2020 00:57:43 +0000 (11:57 +1100)]
Merge pull request #19141 from seamuslee001/dev_core_2232_2
dev/core#2232 Permit hook_civicrm_container and some other prebootish…
Monish Deb [Wed, 9 Dec 2020 00:07:40 +0000 (05:37 +0530)]
core#2174: Activity Summary report is missing pagination
Coleman Watts [Tue, 8 Dec 2020 23:04:14 +0000 (18:04 -0500)]
Search kit: Wider dropdowns for entity selection
Coleman Watts [Tue, 8 Dec 2020 22:52:44 +0000 (17:52 -0500)]
Search kit: Add UI support for multiple, nested joins
Seamus Lee [Tue, 8 Dec 2020 01:02:23 +0000 (12:02 +1100)]
dev/core#2232 Permit hook_civicrm_container and some other prebootish hooks to run during upgrade and clear out the asset builder cache post upgrade
colemanw [Tue, 8 Dec 2020 19:29:54 +0000 (14:29 -0500)]
Merge pull request #19023 from eileenmcnaughton/tt
Extend test to cover membership logs
colemanw [Tue, 8 Dec 2020 19:24:38 +0000 (14:24 -0500)]
Merge pull request #19110 from eileenmcnaughton/act_import
Preliminary cleanup -remove unused params from function signature
Tim Otten [Tue, 8 Dec 2020 05:27:13 +0000 (21:27 -0800)]
CRM_Event_Form_Task_Register - Fix error "getFieldValue failed" (tentative)
When preparing the event-registration form, `CRM_Event_Page_Tab::preProcess()` looks up the designated contact ID and
calls `checkUserPermission()`. The error message is (effectively) reporting that the permission-check fails because
there is no contact ID.
And this is a legit thing to complain about -- if you're embedding the event-registration form as part of a
search-task, then there is no *singular* contact ID. (There is a potentially very long list of contact IDs - which is
probably stored/reported some other way.) The permission-check for this context seems like it ought to be different.
I labeled the commit (tentative) because I'm not entirely certain that I understand the contract of this
route/controller. It has multiple overlapping use-cases, and I'm not certain if I've tracked them all. However, this
patch does seem to fix the "getFieldValue failed" problem when running as a search-task.
Seamus Lee [Tue, 8 Dec 2020 05:05:27 +0000 (16:05 +1100)]
Merge pull request #19117 from eileenmcnaughton/test_find
Add test to check pcp notification is sent
Seamus Lee [Tue, 8 Dec 2020 05:04:34 +0000 (16:04 +1100)]
Merge pull request #19142 from demeritcowboy/schema-comment
Minor typos in schema files
demeritcowboy [Tue, 8 Dec 2020 02:13:18 +0000 (21:13 -0500)]
no comment
Eileen McNaughton [Tue, 8 Dec 2020 02:14:40 +0000 (15:14 +1300)]
Merge pull request #19140 from civicrm/5.33
5.33
colemanw [Tue, 8 Dec 2020 01:42:54 +0000 (20:42 -0500)]
Merge pull request #18941 from colemanw/multiValueContactRef
Add support for multi-value contact reference custom fields
Seamus Lee [Tue, 8 Dec 2020 00:00:09 +0000 (11:00 +1100)]
Merge pull request #19138 from demeritcowboy/tabs-profile
dev/core#2233 - Fix broken tabs on profiles admin page
Seamus Lee [Mon, 7 Dec 2020 23:36:40 +0000 (10:36 +1100)]
Merge pull request #19139 from seamuslee001/dev_core_2235
[NFC] dev/core#2235 Fix url link to the OrderAPI Documenation
Seamus Lee [Mon, 7 Dec 2020 23:14:31 +0000 (10:14 +1100)]
Merge pull request #19099 from seamuslee001/ref_money_format_update
[REF] Deprecate passing a blank currecny to CRM_Utils_Money::format a…
Seamus Lee [Mon, 7 Dec 2020 19:41:43 +0000 (06:41 +1100)]
[NFC] dev/core#2235 Fix url link to the OrderAPI Documenation
Seamus Lee [Mon, 7 Dec 2020 19:36:15 +0000 (06:36 +1100)]
Merge pull request #19135 from civicrm/5.33
5.33
demeritcowboy [Mon, 7 Dec 2020 19:19:37 +0000 (14:19 -0500)]
fix broken tabs
Coleman Watts [Mon, 7 Dec 2020 19:19:20 +0000 (14:19 -0500)]
Search kit: Add explicit conditions on entityBridge joins
Seamus Lee [Mon, 7 Dec 2020 18:58:47 +0000 (05:58 +1100)]
Merge pull request #19137 from mlutfy/eventNotices
Manage Event: avoid E_NOTICE in smarty
Mathieu Lutfy [Mon, 7 Dec 2020 14:49:45 +0000 (09:49 -0500)]
Manage Event: avoid E_NOTICE in smarty
Seamus Lee [Mon, 7 Dec 2020 07:44:24 +0000 (18:44 +1100)]
Merge pull request #19134 from mglaman/patch-2
Fix mglaman mapping
Matt Glaman [Mon, 7 Dec 2020 05:08:50 +0000 (23:08 -0600)]
Fix mglaman mapping
Eileen McNaughton [Sun, 6 Dec 2020 20:47:04 +0000 (09:47 +1300)]
Merge pull request #19086 from agileware/CIVICRM-1617
CIVICRM-1617: Only make line_item array if it doesn't exist already.
Eileen McNaughton [Sun, 6 Dec 2020 19:15:31 +0000 (08:15 +1300)]
Merge pull request #19132 from seamuslee001/master
5.33
Seamus Lee [Sun, 6 Dec 2020 05:34:25 +0000 (16:34 +1100)]
Merge in 5.33
eileen [Sat, 5 Dec 2020 23:00:26 +0000 (12:00 +1300)]
Add test to check pcp notification is sent
I wound up adding PcpBlock v4 api to write the test
In support of
#19096
eileen [Fri, 4 Dec 2020 05:32:16 +0000 (18:32 +1300)]
Add test to check pcp notification is sent
I wound up adding PcpBlock v4 api to write the test
In support of
https://github.com/civicrm/civicrm-core/pull/19096
Eileen McNaughton [Sat, 5 Dec 2020 22:29:10 +0000 (11:29 +1300)]
Merge pull request #19131 from demeritcowboy/tagset-null
dev/core#2234 - Don't display the word 'null' after adding a new tagset
Matthew Wire [Sat, 5 Dec 2020 20:18:09 +0000 (20:18 +0000)]
Merge pull request #18096 from mattwire/orderapiparticipantstatusid
Allow overriding participant_status_id in Order API
Matthew Wire [Sat, 5 Dec 2020 20:14:11 +0000 (20:14 +0000)]
Merge pull request #19129 from jitendrapurohit/paylaterreceipt
Allow Sendconfirmation api to override pay later receipt text
Seamus Lee [Sat, 5 Dec 2020 19:39:04 +0000 (06:39 +1100)]
Merge pull request #19130 from mattwire/extensionstabselected
Fix extensions tabs following deprecation of old tab code
demeritcowboy [Sat, 5 Dec 2020 15:56:23 +0000 (10:56 -0500)]
don't display the word 'null'
Matthew Wire [Sat, 5 Dec 2020 15:26:17 +0000 (15:26 +0000)]
Fix extensions tabs following deprecation of old tab code
Matthew Wire [Thu, 20 Aug 2020 21:42:13 +0000 (22:42 +0100)]
Allow setting the participant status in Order.create api (required by event cart)
Jitendra Purohit [Sat, 5 Dec 2020 09:59:00 +0000 (15:29 +0530)]
Allow Sendconfirmation api to override pay later receipt text
Tim Otten [Sat, 5 Dec 2020 07:29:28 +0000 (23:29 -0800)]
Event Registration Task - Propagate different qfKey & action for AJAX URLs
When use the search-task to register event participants, the qfKey is
mismatched, and the action is VIEW. It should be ADD, and the qfKey
should be for CRM_Event_Form_Participant.
eileen [Sat, 5 Dec 2020 02:07:50 +0000 (15:07 +1300)]
Additional fix
Seamus Lee [Fri, 4 Dec 2020 20:03:26 +0000 (07:03 +1100)]
Fix Fatal Error on trying to use the Register contacts to an event Advanced Search task
Eileen McNaughton [Sat, 5 Dec 2020 05:00:49 +0000 (18:00 +1300)]
Merge pull request #19123 from totten/5.33-search-range
dev/core#2188 - Upgrader - Cleanup any invalid combinations of is_search_range
Seamus Lee [Sat, 5 Dec 2020 00:38:28 +0000 (11:38 +1100)]
Merge pull request #19119 from eileenmcnaughton/532b
dev/core#2231 fix failure to calculate next_scheduled_date
Tim Otten [Sat, 5 Dec 2020 00:35:37 +0000 (16:35 -0800)]
dev/core#2188 - Upgrader - Cleanup any invalid combinations of is_search_range=1
These invalid configurations were previously asymptomatic in 5.30 but became symptomatic in 5.31.
colemanw [Sat, 5 Dec 2020 00:35:10 +0000 (19:35 -0500)]
Merge pull request #19105 from colemanw/searchJoins
Search Kit: Support robust joins in UI
Tim Otten [Sat, 5 Dec 2020 00:34:05 +0000 (16:34 -0800)]
Set version to 5.33.beta2
eileen [Fri, 4 Dec 2020 21:17:17 +0000 (10:17 +1300)]
Handle possibility of fee_amount = ''
eileen [Fri, 4 Dec 2020 21:08:30 +0000 (10:08 +1300)]
dev/core#2231 fix failure to calculate next_scheduled_date
Eileen McNaughton [Fri, 4 Dec 2020 20:40:44 +0000 (09:40 +1300)]
Merge pull request #19061 from christianwach/lab-core-2217
Prevent "add_action" from being called multiple times
colemanw [Fri, 4 Dec 2020 19:54:19 +0000 (14:54 -0500)]
Merge pull request #19083 from eileenmcnaughton/contsoft
Add ContributionSoft v4 api
Seamus Lee [Fri, 4 Dec 2020 19:40:52 +0000 (06:40 +1100)]
Merge pull request #19103 from eileenmcnaughton/import_extract
[REF] Extract duplicate handling code
Matthew Wire [Fri, 4 Dec 2020 10:11:23 +0000 (10:11 +0000)]
Merge pull request #19066 from colemanw/tabCleanup
Fix dev/core#2215 & remove the tab selection inline script from TabHeader.tpl
Seamus Lee [Fri, 4 Dec 2020 08:43:46 +0000 (19:43 +1100)]
Merge pull request #19072 from eileenmcnaughton/url
dev/financial#157 [REF] Extract functions
Seamus Lee [Fri, 4 Dec 2020 05:42:29 +0000 (16:42 +1100)]
Merge pull request #19107 from eileenmcnaughton/oauth
Unhide oauth extension
eileen [Thu, 3 Dec 2020 21:59:47 +0000 (10:59 +1300)]
[REF] Extract duplicate handling code
This winds up being a very strange process - however the goal seems to be
to unravel error handling to appropriate exception throwing & catching
& a bit of back & forth helps us isolate the code places
Eileen McNaughton [Fri, 4 Dec 2020 05:33:51 +0000 (18:33 +1300)]
Merge pull request #19108 from eileenmcnaughton/import
Remove obsolete IF
eileen [Fri, 4 Dec 2020 04:01:07 +0000 (17:01 +1300)]
Preliminary cleanup -remove unused params from function signature
These don't match the parent params & are not used so bye bye
Eileen McNaughton [Fri, 4 Dec 2020 03:20:07 +0000 (16:20 +1300)]
Merge pull request #19104 from MegaphoneJon/export-fix
Unable to export contacts in Civi 5.32+
eileen [Fri, 4 Dec 2020 01:54:42 +0000 (14:54 +1300)]
Remove obsolete IF
Per previous PR there is an early return making this if meaningless but
due to the whitespace change it was not in that PR
Seamus Lee [Fri, 4 Dec 2020 01:28:32 +0000 (12:28 +1100)]
Merge pull request #19098 from eileenmcnaughton/import
[REF] Duplicate possibly-used parts of createProfileContact onto Parser_Contact
eileen [Fri, 4 Dec 2020 01:04:56 +0000 (14:04 +1300)]
Unhide oauth extension
We previously indicated in dev-digest oauth would ship in 5.32 &
be unhidden in 5.33 but we forgot to do the last bit
eileen [Fri, 4 Dec 2020 00:41:10 +0000 (13:41 +1300)]
Minor cleanup in test class
eileen [Tue, 1 Dec 2020 02:33:56 +0000 (15:33 +1300)]
Add ContributionSoft v4 api
Coleman Watts [Fri, 4 Dec 2020 00:28:00 +0000 (19:28 -0500)]
Search Ext: Support robust joins in UI
This uses better join metadata to give explicit conditions for each join,
removing the ambiguity when more than one type of join is possible between the same 2 entities.
It also adds support for joins via EntityBridge APIs.
Eileen McNaughton [Fri, 4 Dec 2020 00:25:46 +0000 (13:25 +1300)]
Merge pull request #19101 from colemanw/searchJoins
Improve APIv4 metadata for RelationshipCache and Bridge entities in general
Jon Goldberg [Fri, 4 Dec 2020 00:16:14 +0000 (19:16 -0500)]
Potential fix for 5.32+ unable to export contacts
Eileen McNaughton [Thu, 3 Dec 2020 23:33:45 +0000 (12:33 +1300)]
Merge pull request #19102 from eileenmcnaughton/err
[REF] use early return for errors rather than confusing assignment
eileen [Thu, 3 Dec 2020 20:42:51 +0000 (09:42 +1300)]
[REF] Duplicate possibly-used parts of createProfileContact onto Parser_Contact
The parser_Contact class should call the api. Getting to that point is
complicated because
1) it's such a mess and
2) it does a lot of work to prepare to call createProfileContact
and it's hard to unravel that.
By copying most of createProfileContact onto the class we can start to
unravel it & pare down to calling the api (note we went through
this process in the dedupe class, at least in part).
I'm pretty sure the hooks reflect 'the way the code grew up' rather than
any logical use/ requirement for the profile hook
eileen [Thu, 3 Dec 2020 21:33:18 +0000 (10:33 +1300)]
[REF] use early return for errors rather than confusing assignment
This just makes the code slightly clearer. The next if can go, but
needs to wait on another PR to be merged to avoid conflict
Coleman Watts [Thu, 3 Dec 2020 20:55:53 +0000 (15:55 -0500)]
Improve APIv4 metadata for RelationshipCache and Bridge entities in general
These are the core changes needed toward geting joins supported by Search Kit
Seamus Lee [Thu, 3 Dec 2020 20:46:59 +0000 (07:46 +1100)]
[REF] Deprecate passing a blank currecny to CRM_Utils_Money::format and also update function call to remove at least one usage of money_format
Eileen McNaughton [Thu, 3 Dec 2020 20:11:06 +0000 (09:11 +1300)]
Merge pull request #19095 from nishant-bhorodia/Issue#537-owner-notification-email-sending-with-every-save
Issue#537: Fix syntax to check pcp_id is NULL in api params
Coleman Watts [Fri, 6 Nov 2020 21:58:08 +0000 (16:58 -0500)]
Add support for multi-value contact reference custom fields