Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Extensions
civimobileapi
Commits
68c41787
Commit
68c41787
authored
May 21, 2021
by
BohdanDmytryshyn
Browse files
Merge branch 'release_5_6_1' into 'master'
Release 5.6.1 See merge request
!54
parents
90081c6d
bdaaf599
Changes
3
Hide whitespace changes
Inline
Side-by-side
CRM/CiviMobileAPI/Hook/AlterMailParams/EventOnlineReceipt.php
View file @
68c41787
...
...
@@ -22,6 +22,10 @@ class CRM_CiviMobileAPI_Hook_AlterMailParams_EventOnlineReceipt {
$eventId
=
(
int
)
$params
[
'tplParams'
][
'eventIdApi'
];
}
if
(
empty
(
$contactId
)
&&
isset
(
$params
[
'contactId'
]))
{
$contactId
=
$params
[
'contactId'
];
}
try
{
$participantId
=
civicrm_api3
(
'Participant'
,
'getvalue'
,
[
'sequential'
=>
1
,
...
...
civimobileapi.php
View file @
68c41787
...
...
@@ -720,12 +720,14 @@ function civimobileapi_civicrm_preProcess($formName, &$form) {
if
(
$formName
==
'CRM_Activity_Form_Activity'
||
$formName
==
'CRM_Custom_Form_CustomDataByType'
)
{
$groupTree
=
$form
->
getVar
(
'_groupTree'
);
foreach
(
$groupTree
as
$key
=>
$customGroup
)
{
if
(
$customGroup
[
'name'
]
==
CRM_CiviMobileAPI_Install_Entity_CustomGroup
::
SURVEY
)
{
unset
(
$groupTree
[
$key
]);
if
(
!
empty
(
$groupTree
))
{
foreach
(
$groupTree
as
$key
=>
$customGroup
)
{
if
(
$customGroup
[
'name'
]
==
CRM_CiviMobileAPI_Install_Entity_CustomGroup
::
SURVEY
)
{
unset
(
$groupTree
[
$key
]);
}
}
$form
->
setVar
(
'_groupTree'
,
$groupTree
);
}
$form
->
setVar
(
'_groupTree'
,
$groupTree
);
}
if
(
$formName
==
'CRM_Contribute_Form_Contribution_Main'
)
{
(
new
CRM_CiviMobileAPI_Hook_Pre_ContributionPayment
)
->
run
();
...
...
info.xml
View file @
68c41787
...
...
@@ -14,8 +14,8 @@
<url
desc=
"Support"
>
https://civimobile.org
</url>
<url
desc=
"Licensing"
>
http://www.gnu.org/licenses/agpl-3.0.html
</url>
</urls>
<releaseDate>
2021-05-1
7
</releaseDate>
<version>
5.6.
0
</version>
<releaseDate>
2021-05-
2
1
</releaseDate>
<version>
5.6.
1
</version>
<compatibility>
<ver>
4.7
</ver>
<ver>
5.20
</ver>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment