diff --git a/src/app/contact/controllers/ContactController.php b/src/app/contact/controllers/ContactController.php index 9b947462c692ec9af60e790d6eeebeb984357308..2bc62f43d70a64deee57fc6257bb820783beb467 100755 --- a/src/app/contact/controllers/ContactController.php +++ b/src/app/contact/controllers/ContactController.php @@ -215,9 +215,16 @@ class ContactController return $response->withStatus(400)->withJson(['errors' => 'Contact does not exist']); } + $civilities = ContactModel::getCivilities(); + $xmlCivility = $civilities[$rawContact['civility']]; + $civility = [ + 'id' => $rawContact['civility'], + 'label' => $xmlCivility['label'], + 'abbreviation' => $xmlCivility['abbreviation'] + ]; $contact = [ 'id' => $rawContact['id'], - 'civility' => $rawContact['civility'], + 'civility' => $civility, 'firstname' => $rawContact['firstname'], 'lastname' => $rawContact['lastname'], 'company' => $rawContact['company'], @@ -1079,7 +1086,14 @@ class ContactController $contact = ['type' => 'contact', 'id' => $args['id'], 'lastname' => $rawContact['lastname'], 'company' => $rawContact['company']]; if (in_array('civility', $displayableStdParameters)) { - $contact['civility'] = !empty($rawContact['civility']) ? ContactModel::getCivilityLabel(['civilityId' => $rawContact['civility']]) : null; + $civilities = ContactModel::getCivilities(); + $xmlCivility = $civilities[$rawContact['civility']]; + $civility = [ + 'id' => $rawContact['civility'], + 'label' => $xmlCivility['label'], + 'abbreviation' => $xmlCivility['abbreviation'] + ]; + $contact['civility'] = $civility; } if (in_array('firstname', $displayableStdParameters)) { $contact['firstname'] = $rawContact['firstname'];