From 85c10ab1b55b5e00909a8e85a999929f32588561 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 1 Sep 2020 16:53:36 +0200
Subject: [PATCH] FIX #14003 TIME 1:15 fix depositSlip recipient + wording
---
.../controllers/RegisteredMailController.php | 25 ++++++++++++++++---
.../print-deposit-list-action.component.html | 3 +++
src/lang/lang-en.json | 1 +
src/lang/lang-fr.json | 5 ++--
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/app/registeredMail/controllers/RegisteredMailController.php b/src/app/registeredMail/controllers/RegisteredMailController.php
index eb87797c23c..ae7b541fd65 100644
--- a/src/app/registeredMail/controllers/RegisteredMailController.php
+++ b/src/app/registeredMail/controllers/RegisteredMailController.php
@@ -14,6 +14,8 @@
namespace RegisteredMail\controllers;
use Com\Tecnick\Barcode\Barcode;
+use Contact\controllers\ContactController;
+use Contact\models\ContactModel;
use RegisteredMail\models\RegisteredMailModel;
use RegisteredMail\models\RegisteredNumberRangeModel;
use Resource\controllers\ResController;
@@ -708,6 +710,21 @@ class RegisteredMailController
$registeredMailNumber = RegisteredMailController::getRegisteredMailNumber(['type' => $args['type'], 'rawNumber' => $registeredMail['number']]);
+ $referenceInfo = json_decode($registeredMail['recipient'], true);
+ $recipient = ContactController::getContactAfnor([
+ 'company' => $referenceInfo['company'],
+ 'civility' => ContactModel::getCivilityId(['civilityLabel' => $referenceInfo['civility']]),
+ 'firstname' => $referenceInfo['firstname'],
+ 'lastname' => $referenceInfo['lastname'],
+ 'address_number' => $referenceInfo['addressNumber'],
+ 'address_street' => $referenceInfo['addressStreet'],
+ 'address_additional1' => $referenceInfo['addressAdditional1'],
+ 'address_additional2' => $referenceInfo['addressAdditional2'],
+ 'address_postcode' => $referenceInfo['addressPostcode'],
+ 'address_town' => $referenceInfo['addressTown'],
+ 'address_country' => $referenceInfo['addressCountry']
+ ]);
+
$pdf->setFont('times', '', 9);
$pdf->Cell(10, 10, $position + 1, 1);
$pdf->setFont('times', '', 9);
@@ -717,13 +734,13 @@ class RegisteredMailController
$pdf->Cell(30, 10, mb_strimwidth($registeredMail['reference'], 0, 25, ""), 1);
$pdf->setFont('times', '', 6);
- if (strlen($registeredMail['recipient'][1] . " " . $registeredMail['recipient'][4] . " " . $registeredMail['recipient'][6]) > 60) {
- $pdf->Cell(95, 10, $registeredMail['recipient'][1], 1);
+ if (strlen($recipient[1] . " " . $recipient[4] . " " . $recipient[6]) > 60) {
+ $pdf->Cell(95, 10, $recipient[1], 1);
$pdf->SetXY($pdf->GetX() - 95, $pdf->GetY() + 3);
- $pdf->Cell(95, 10, $registeredMail['recipient'][4] . " " . $registeredMail['recipient'][6], 0);
+ $pdf->Cell(95, 10, $recipient[4] . " " . $recipient[6], 0);
$pdf->SetXY($pdf->GetX() + 95, $pdf->GetY() - 3);
} else {
- $pdf->Cell(95, 10, $registeredMail['recipient'][1] . " " . $registeredMail['recipient'][4] . " " . $registeredMail['recipient'][6], 1);
+ $pdf->Cell(95, 10, $recipient[1] . " " . $recipient[4] . " " . $recipient[6], 1);
}
diff --git a/src/frontend/app/actions/print-deposit-list-action/print-deposit-list-action.component.html b/src/frontend/app/actions/print-deposit-list-action/print-deposit-list-action.component.html
index 9957f5f7623..4c42a57d6bb 100644
--- a/src/frontend/app/actions/print-deposit-list-action/print-deposit-list-action.component.html
+++ b/src/frontend/app/actions/print-deposit-list-action/print-deposit-list-action.component.html
@@ -7,6 +7,9 @@
<div class="row">
<div>
<div class="alert-message alert-message-info" role="alert">
+ <p>
+ {{'lang.registeredMailsIncludedExplication' | translate}}
+ </p>
<p>
{{'lang.registeredMailsIncluded' | translate}}
</p>
diff --git a/src/lang/lang-en.json b/src/lang/lang-en.json
index 0431ab7b47b..4515d5da310 100644
--- a/src/lang/lang-en.json
+++ b/src/lang/lang-en.json
@@ -1912,6 +1912,7 @@
"argumentPhoneNotCorrect": "Argument phone is not correct for a user.",
"authorizedRoutesInformations": "One route per row. Routes documentation",
"canNotDisabledField": "This field can not be disabled because it is empty and mandatory",
+ "registeredMailsIncludedExplication": "All registered mails with the same desired shipping date, same type and same issuing site will be included in the deposit list.",
"registeredMailsIncluded": "Number of registered mails included",
"cannotGenerateDepositListForMails": "Imposible to generate for the following registered mails :",
"accountNumberAlreadyUsed": "Account number is already used by another issuing site",
diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json
index 8a1b1e4266d..8d65b1a4b5b 100644
--- a/src/lang/lang-fr.json
+++ b/src/lang/lang-fr.json
@@ -1940,10 +1940,11 @@
"argumentMailEmpty": "La donnée mail est vide pour un utilisateur.",
"argumentFirstnameNotString": "La donnée firstname n'est pas une chaine de caractère pour un utilisateur.",
"argumentLastnameNotString": "La donnée lastname n'est pas une chaine de caractère pour un utilisateur.",
- "argumentMailNotCorrect": "La donnée mail n'est pas correcte pour un utilisateur.",
- "argumentPhoneNotCorrect": "La donnée phone n'est pas correcte pour un utilisateur.",
+ "argumentMailNotCorrect": "La donnée mail ne correspond pas à un format de courriel valide pour un utilisateur.",
+ "argumentPhoneNotCorrect": "La donnée phone ne correspond pas à un format de numéro de téléphone valide pour un utilisateur.",
"authorizedRoutesInformations": "Une route par ligne. Documentation des routes",
"canNotDisabledField": "Le champ ne peut pas être désactivé car il est vide et obligatoire",
+ "registeredMailsIncludedExplication": "Tous les recommandés avec la même date d'expédition souhaitée, le même type et le même site émetteur seront inclus dans le bordereau.",
"registeredMailsIncluded": "Nombre de recommandés inclus :",
"cannotGenerateDepositListForMails": "Génération impossible pour les recommandés suivants :",
"accountNumberAlreadyUsed": "Le N° COCLICO est déjà utilisé par un autre site émetteur",
--
GitLab