From cccfcd49560a62d8a0da4cad87ac3a5876741686 Mon Sep 17 00:00:00 2001
From: ErikHommel <hommel@ee-atwork.nl>
Date: Wed, 3 Mar 2021 17:00:27 +0100
Subject: [PATCH] fix #15 - does not file on case
---
CHANGELOG.md | 3 +++
api/v3/Email/Send.php | 11 ++++++++---
info.xml | 4 ++--
3 files changed, 13 insertions(+), 5 deletions(-)
create mode 100644 CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..e058fce
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,3 @@
+# CHANGELOG
+## Version 2.1 (not yet released)
+* issue 15: email does not file on case
diff --git a/api/v3/Email/Send.php b/api/v3/Email/Send.php
index fb6400f..4c54af8 100644
--- a/api/v3/Email/Send.php
+++ b/api/v3/Email/Send.php
@@ -88,10 +88,8 @@ function civicrm_api3_email_send($params) {
$messageTemplates = new CRM_Core_DAO_MessageTemplate();
$messageTemplates->id = $params['template_id'];
- // From header defaults to site default.
list($defaultFromName, $defaultFromEmail) = CRM_Core_BAO_Domain::getNameAndEmail();
$from = "\"$defaultFromName\" <$defaultFromEmail>";
-
if (!empty($params['from_email']) && !empty($params['from_name'])) {
// If both an email and a name are provided, use those as the from header.
$from = '"' . $params['from_name'] . '" <' . $params['from_email'] . '>';
@@ -196,10 +194,17 @@ function civicrm_api3_email_send($params) {
];
CRM_Activity_BAO_ActivityContact::create($activityTargetParams);
+ $caseId = NULL;
if (!empty($case_id)) {
+ $caseId = $case_id;
+ }
+ if (!empty($params['case_id'])) {
+ $caseId = $case_id;
+ }
+ if ($caseId) {
$caseActivity = [
'activity_id' => $activity['id'],
- 'case_id' => $case_id,
+ 'case_id' => $caseId,
];
CRM_Case_BAO_Case::processCaseActivity($caseActivity);
}
diff --git a/info.xml b/info.xml
index f6b1516..8c19232 100644
--- a/info.xml
+++ b/info.xml
@@ -14,8 +14,8 @@
<url desc="Support">https://civicoop.org</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2021-01-20</releaseDate>
- <version>2.0</version>
+ <releaseDate>2021-03-03</releaseDate>
+ <version>2.1dev</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.28</ver>
--
GitLab