From 4c15f09dad8edb8fab6f7063cea0212d3a83393c Mon Sep 17 00:00:00 2001 From: jps Date: Tue, 16 Dec 2025 15:27:16 +0100 Subject: [PATCH] modification message erreur modal --- app/controllers/Plugin.php | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/app/controllers/Plugin.php b/app/controllers/Plugin.php index a974311..64f76fe 100644 --- a/app/controllers/Plugin.php +++ b/app/controllers/Plugin.php @@ -643,6 +643,34 @@ class PEPPOL_Plugin { } } + // Extraire le message d'erreur depuis response_data de la même manière que le template email + // pour garantir la cohérence entre la modal et l'email + $error_message_to_display = $row->message ?? ''; + + if (!empty($response_data) && (is_array($response_data) || is_object($response_data))) { + // Convertir en tableau si c'est un objet + $error_data = is_object($response_data) ? (array) $response_data : $response_data; + + if (is_array($error_data)) { + // Structure avec error.message + if (isset($error_data['error']['message'])) { + $error_message_to_display = (string) $error_data['error']['message']; + } + // Structure avec details.validation_error + elseif (isset($error_data['details']['validation_error'])) { + $error_message_to_display = (string) $error_data['details']['validation_error']; + } + // Structure avec validation_error directement + elseif (isset($error_data['validation_error'])) { + $error_message_to_display = (string) $error_data['validation_error']; + } + // Structure avec message directement + elseif (isset($error_data['message'])) { + $error_message_to_display = (string) $error_data['message']; + } + } + } + $payload_response = [ 'id' => $row->id, 'id_order' => $row->id_order ?? 0, @@ -651,7 +679,7 @@ class PEPPOL_Plugin { 'peppol_document_id' => $row->peppol_document_id ?? '', 'status' => $row->status ?? '', 'success' => !empty($row->success), - 'message' => $row->message ?? '', + 'message' => $error_message_to_display, 'http_code' => $row->http_code ?? null, 'date_add' => $row->date_add ?? '', 'date_update' => $row->date_update ?? '',