Skip to content
Snippets Groups Projects
Verified Commit 771da74e authored by Damien's avatar Damien
Browse files

FEAT #12224 TIME 0:15 Refactoring export + date custom field contact

parent 412e03f5
No related branches found
No related tags found
No related merge requests found
...@@ -17,6 +17,7 @@ use Contact\models\ContactCustomFieldListModel; ...@@ -17,6 +17,7 @@ use Contact\models\ContactCustomFieldListModel;
use Contact\models\ContactFillingModel; use Contact\models\ContactFillingModel;
use Contact\models\ContactModel; use Contact\models\ContactModel;
use Contact\models\ContactParameterModel; use Contact\models\ContactParameterModel;
use CustomField\models\CustomFieldModel;
use Entity\models\EntityModel; use Entity\models\EntityModel;
use Group\controllers\PrivilegeController; use Group\controllers\PrivilegeController;
use History\controllers\HistoryController; use History\controllers\HistoryController;
...@@ -135,6 +136,17 @@ class ContactController ...@@ -135,6 +136,17 @@ class ContactController
$externalId = '{}'; $externalId = '{}';
} }
if (!empty($body['customFields'])) {
foreach ($body['customFields'] as $key => $value) {
$customField = ContactCustomFieldListModel::getById(['id' => $key, 'select' => ['type']]);
if ($customField['type'] == 'date') {
$date = new \DateTime($value);
$value = $date->format('Y-m-d');
$body['customFields'][$key] = $value;
}
}
}
$id = ContactModel::create([ $id = ContactModel::create([
'civility' => $body['civility'] ?? null, 'civility' => $body['civility'] ?? null,
'firstname' => $body['firstname'] ?? null, 'firstname' => $body['firstname'] ?? null,
......
...@@ -646,11 +646,11 @@ class ExportController ...@@ -646,11 +646,11 @@ class ExportController
return null; return null;
} }
$customFieldId = $customField[1]; $customFieldId = $customField[1];
$customField = ResModel::get(['select' => ["custom_fields->>'{$customFieldId}' as csfield"], 'where' => ['res_id = ?'], 'data' => [$args['resId']]]); $customField = ResModel::get(['select' => ["custom_fields->'{$customFieldId}' as csfield"], 'where' => ['res_id = ?'], 'data' => [$args['resId']]]);
if (empty($customField[0]['csfield'])) { if (empty($customField[0]['csfield'])) {
return null; return null;
} }
$customValues = json_decode($customField[0]['csfield']); $customValues = json_decode($customField[0]['csfield'], true);
if (!isset($customValues)) { if (!isset($customValues)) {
return null; return null;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment