diff --git a/src/app/contact/controllers/ContactController.php b/src/app/contact/controllers/ContactController.php index d24ab3dae588654f19c31638ccacdf38e9b0a2a5..e70c0ee790ff18c1418547009619bf3fac44a912 100755 --- a/src/app/contact/controllers/ContactController.php +++ b/src/app/contact/controllers/ContactController.php @@ -1244,7 +1244,7 @@ class ContactController $customId = explode('_', $frontField)[1]; // Check custom field format $type = $customTypes[(string)$customId]; - if (in_array($type, ['checkbox', 'select', 'radio']) && !Validator::arrayType()->validate($contact[$frontField])) { + if (in_array($type, ['checkbox', 'radio']) && !Validator::arrayType()->validate($contact[$frontField])) { $errors[] = ['error' => "Argument {$frontField} is not an array for contact {$key}", 'index' => $key, 'lang' => 'argumentNotArray']; continue 2; } elseif ($customTypes[$customId] == 'integer' && !Validator::intVal()->validate($contact[$frontField])) { @@ -1253,7 +1253,7 @@ class ContactController } elseif ($customTypes[$customId] == 'date' && !Validator::date()->validate($contact[$frontField])) { $errors[] = ['error' => "Argument {$frontField} is not a date for contact {$key}", 'index' => $key, 'lang' => 'argumentNotDate']; continue 2; - } elseif ($customTypes[$customId] == 'string' && !Validator::stringType()->validate($contact[$frontField]) || !Validator::length(1, 255)->validate($contact[$frontField])) { + } elseif (in_array($customTypes[$customId], ['string', 'select']) && !Validator::stringType()->validate($contact[$frontField]) || !Validator::length(1, 255)->validate($contact[$frontField])) { $errors[] = ['error' => "Argument {$frontField} is not a string for contact {$key}", 'index' => $key, 'lang' => 'argumentNotString']; continue 2; } diff --git a/src/app/registeredMail/controllers/IssuingSiteController.php b/src/app/registeredMail/controllers/IssuingSiteController.php index 372186ff06e0035092eba361db7ddbe8d91ec11e..99808dd66e7838a337f3412f866831dcdc20433e 100644 --- a/src/app/registeredMail/controllers/IssuingSiteController.php +++ b/src/app/registeredMail/controllers/IssuingSiteController.php @@ -26,10 +26,6 @@ class IssuingSiteController { public function get(Request $request, Response $response) { - if (!PrivilegeController::hasPrivilege(['privilegeId' => 'admin_registered_mail', 'userId' => $GLOBALS['id']])) { - return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']); - } - $sites = IssuingSiteModel::get(); foreach ($sites as $key => $site) { @@ -55,10 +51,6 @@ class IssuingSiteController public function getById(Request $request, Response $response, array $args) { - if (!PrivilegeController::hasPrivilege(['privilegeId' => 'admin_registered_mail', 'userId' => $GLOBALS['id']])) { - return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']); - } - $site = IssuingSiteModel::getById(['id' => $args['id']]); if (empty($site)) { diff --git a/src/app/registeredMail/controllers/RegisteredMailController.php b/src/app/registeredMail/controllers/RegisteredMailController.php index 8b31be2b00fc2d939fca8e21a1caa2ec155be761..e8da83c17e1b863a0bf0b0a0bf064083b1136c18 100644 --- a/src/app/registeredMail/controllers/RegisteredMailController.php +++ b/src/app/registeredMail/controllers/RegisteredMailController.php @@ -99,7 +99,7 @@ class RegisteredMailController } if ($range[0]['current_number'] + 1 > $range[0]['range_end']) { - $status = 'DEL'; + $status = 'END'; $nextNumber = $range[0]['current_number']; } else { $status = 'OK'; @@ -171,8 +171,9 @@ class RegisteredMailController return $response->withStatus(400)->withJson(['errors' => 'Body number is not valid']); } - $type = substr($body['number'], 0, 2); - $number = substr($body['number'], 3, 12); + $number = trim($body['number'], ' '); + $type = substr($number, 0, 2); + $number = substr($number, 3, 12); $number = str_replace(' ', '', $number); $registeredMail = RegisteredMailModel::get([ @@ -181,7 +182,7 @@ class RegisteredMailController 'data' => [$number, $type] ]); if (empty($registeredMail)) { - return $response->withStatus(400)->withJson(['errors' => 'Registered mail number not found']); + return $response->withStatus(400)->withJson(['errors' => 'Registered mail number not found', 'lang' => 'registeredMailNotFound']); } $registeredMail = $registeredMail[0]; if (!empty($registeredMail['received_date'])) { diff --git a/src/app/registeredMail/controllers/RegisteredMailTrait.php b/src/app/registeredMail/controllers/RegisteredMailTrait.php index a1f98c599c5b998e3980d58faf1220e1e4621a9d..5a1aed38eb95cea1d0cabadb69fc20081059e437 100644 --- a/src/app/registeredMail/controllers/RegisteredMailTrait.php +++ b/src/app/registeredMail/controllers/RegisteredMailTrait.php @@ -64,7 +64,7 @@ trait RegisteredMailTrait } if ($range[0]['current_number'] + 1 > $range[0]['range_end']) { - $status = 'DEL'; + $status = 'END'; $nextNumber = $range[0]['current_number']; } else { $status = 'OK'; diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php index 749ecd0fc67dcd033d368420e6f91b2e68086f99..d06b2216198b7146a5cf6f09c9634cba58c893f7 100755 --- a/src/core/lang/lang-fr.php +++ b/src/core/lang/lang-fr.php @@ -476,6 +476,6 @@ define('_SAVE_REGISTERED_MAIL', 'Enregistrer le recommandé'); define('_SAVE_PRINT_REGISTERED_MAIL', 'Enregistrer et imprimer le recommandé'); define('_SAVE_INDEX_REGISTERED_MAIL', 'Enregistrer le recommandé et lancer l\'indexation'); define('_PRINT_REGISTERED_MAIL', 'Imprimer le recommandé'); -define('_PRINT_DEPOSIT_LIST', "Imprimer le bordereau d'envoi"); +define('_PRINT_DEPOSIT_LIST', "Imprimer le descriptif de pli"); define('_NOT_REGISTERED_MAIL', "N'est pas un recommandé"); define('_NOT_GENERATED', 'Non généré'); diff --git a/src/lang/lang-en.json b/src/lang/lang-en.json index 2c0c09ef4cdbd8ca3fddae4b8e463a024a35780b..8e06db69c8fe15a7c333bb4f6b701b883c8ea7da 100644 --- a/src/lang/lang-en.json +++ b/src/lang/lang-en.json @@ -1992,5 +1992,6 @@ "importContacts": "Import contacts", "csvHeader": "Csv header", "confirmImportContacts": "Do you want to import <b>{{0}}</b> contacts", - "importedContacts": "imported contacts" -} \ No newline at end of file + "importedContacts": "imported contacts", + "registeredMailNotFound": "This registered mail does not exist" +} diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json index bc70affb51acb39eecf0d4f75552db6383f17e7a..8c70ff36d2268dbfd3c234c2e77e02fa016fa3f3 100644 --- a/src/lang/lang-fr.json +++ b/src/lang/lang-fr.json @@ -1987,5 +1987,6 @@ "noneItalic": "<em>Aucun</em>", "csvHeader": "En-tête csv", "confirmImportContacts": "Voulez-vous importer <b>{{0}}</b> contacts", - "importedContacts": "contacts importés" + "importedContacts": "contacts importés", + "registeredMailNotFound": "Ce recommandé n'existe pas" }