FEAT #14003 TIME 0:40 Add country in deposit list + add history when AR received

src/app/registeredMail/controllers/RegisteredMailController.php

@@ -19,6 +19,7 @@ use Contact\models\ContactModel;
 use Convert\models\AdrModel;
 use Docserver\controllers\DocserverController;
 use Group\controllers\PrivilegeController;
+use History\controllers\HistoryController;
 use Parameter\models\ParameterModel;
 use RegisteredMail\models\IssuingSiteModel;
 use RegisteredMail\models\RegisteredMailModel;
@@ -196,6 +197,7 @@ class RegisteredMailController
             $set = ['received_date' => 'CURRENT_TIMESTAMP'];
             $status = ParameterModel::getById(['select' => ['param_value_string'], 'id' => 'registeredMailDistributedStatus']);
             $status = $status['param_value_string'];
+            $info = _REGISTERED_MAIL_DISTRIBUTED;
         } else {
             if (!Validator::stringType()->notEmpty()->validate($body['returnReason'])) {
                 return $response->withStatus(400)->withJson(['errors' => 'Body returnReason is empty or not a string']);
@@ -212,6 +214,7 @@ class RegisteredMailController
             $set = ['received_date' => $body['receivedDate'], 'return_reason' => $body['returnReason']];
             $status = ParameterModel::getById(['select' => ['param_value_string'], 'id' => 'registeredMailNotDistributedStatus']);
             $status = $status['param_value_string'];
+            $info = _REGISTERED_MAIL_NOT_DISTRIBUTED;
         }
 
         RegisteredMailModel::update([
@@ -227,6 +230,15 @@ class RegisteredMailController
             ]);
         }
 
+        HistoryController::add([
+            'tableName' => 'res_letterbox',
+            'recordId'  => $registeredMail['res_id'],
+            'eventType' => 'ACTION#0',
+            'info'      => $info,
+            'moduleId'  => 'resource',
+            'eventId'   => 'registeredMailReceived'
+        ]);
+
         return $response->withStatus(204);
     }
 
@@ -820,13 +832,13 @@ class RegisteredMailController
             $pdf->Cell(30, 10, mb_strimwidth($registeredMail['reference'], 0, 22, "...", "UTF-8"), 1, 0, 'C');
 
             $pdf->setFont('times', '', 6);
-            if (strlen($recipient[1] . " " . $recipient[4] . " " . $recipient[6]) > 60) {
+            if (strlen($recipient[1] . " " . $recipient[4] . " " . $recipient[6] . " " . $recipient[7]) > 60) {
                 $pdf->Cell(95, 10, $recipient[1], 1);
                 $pdf->SetXY($pdf->GetX() - 95, $pdf->GetY() + 3);
-                $pdf->Cell(95, 10, $recipient[4] . " " . $recipient[6], 0);
+                $pdf->Cell(95, 10, $recipient[4] . " " . $recipient[6] . " " . $recipient[7], 0);
                 $pdf->SetXY($pdf->GetX() + 95, $pdf->GetY() - 3);
             } else {
-                $pdf->Cell(95, 10, $recipient[1] . " " . $recipient[4] . " " . $recipient[6], 1);
+                $pdf->Cell(95, 10, $recipient[1] . " " . $recipient[4] . " " . $recipient[6] . " " . $recipient[7], 1);
             }
 
 

src/core/lang/lang-en.php

@@ -479,3 +479,6 @@ define('_PRINT_REGISTERED_MAIL', 'Print registered mail');
 define('_PRINT_DEPOSIT_LIST', "Print deposit list");
 define('_NOT_REGISTERED_MAIL', 'Not a registered mail');
 define('_NOT_GENERATED', 'Not generated');
+
+define('_REGISTERED_MAIL_DISTRIBUTED', 'Acknowledgement receipt received : registered mail distributed');
+define('_REGISTERED_MAIL_NOT_DISTRIBUTED', 'Acknowledgement receipt received : registered mail not distributed');

src/core/lang/lang-fr.php

@@ -479,3 +479,6 @@ define('_PRINT_REGISTERED_MAIL', 'Imprimer le recommandé');
 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é');
+
+define('_REGISTERED_MAIL_DISTRIBUTED', 'Accusé de réception reçu : recommandé distribué');
+define('_REGISTERED_MAIL_NOT_DISTRIBUTED', 'Accusé de réception reçu : recommandé non distribué');

src/core/lang/lang-nl.php

@@ -473,3 +473,6 @@ define("_ISSUING_SITE_DELETED", "Issuing site deleted"); //TO TRANSLATE
 define("_REGISTERED_NUMBER_RANGE_CREATED", "Registered number range created"); //TO TRANSLATE
 define("_REGISTERED_NUMBER_RANGE_UPDATED", "Registered number range updated"); //TO TRANSLATE
 define("_REGISTERED_NUMBER_RANGE_DELETED", "Registered number range deleted"); //TO TRANSLATE
+
+define('_REGISTERED_MAIL_DISTRIBUTED', 'Acknowledgement receipt received : registered mail distributed'); //TO TRANSLATE
+define('_REGISTERED_MAIL_NOT_DISTRIBUTED', 'Acknowledgement receipt received : registered mail not distributed'); //TO TRANSLATE