Skip to content
Snippets Groups Projects
Commit 160f4750 authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

FEAT #11282 TIME 0:40 merge custom fields

parent db89194e
No related branches found
No related tags found
No related merge requests found
...@@ -255,6 +255,18 @@ class MergeController ...@@ -255,6 +255,18 @@ class MergeController
'time' => date('H:i') 'time' => date('H:i')
]; ];
// Custom fields
$customFields = [];
if (!empty($args['customFields'])) {
foreach ($args['customFields'] as $key => $customField) {
if (is_array($customField)) {
$customFields[$key] .= implode("\n", $customField);
} else {
$customFields[$key] .= $customField;
}
}
}
$dataToBeMerge['res_letterbox'] = $resource; $dataToBeMerge['res_letterbox'] = $resource;
$dataToBeMerge['initiator'] = empty($initiator) ? [] : $initiator; $dataToBeMerge['initiator'] = empty($initiator) ? [] : $initiator;
$dataToBeMerge['parentInitiator'] = empty($parentInitiator) ? [] : $parentInitiator; $dataToBeMerge['parentInitiator'] = empty($parentInitiator) ? [] : $parentInitiator;
...@@ -269,6 +281,7 @@ class MergeController ...@@ -269,6 +281,7 @@ class MergeController
$dataToBeMerge['contact'] = []; $dataToBeMerge['contact'] = [];
$dataToBeMerge['notes'] = $mergedNote; $dataToBeMerge['notes'] = $mergedNote;
$dataToBeMerge['datetime'] = $datetime; $dataToBeMerge['datetime'] = $datetime;
$dataToBeMerge['custom'] = $customFields;
return $dataToBeMerge; return $dataToBeMerge;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment