diff --git a/src/frontend/app/registeredMail/acknowledgement-reception/acknowledgement-reception.component.ts b/src/frontend/app/registeredMail/acknowledgement-reception/acknowledgement-reception.component.ts index 0c923ead809d9651e63eb03af434f1e8ec58f952..164a2ce928b5ff9ab868edfc70b9923877a31301 100644 --- a/src/frontend/app/registeredMail/acknowledgement-reception/acknowledgement-reception.component.ts +++ b/src/frontend/app/registeredMail/acknowledgement-reception/acknowledgement-reception.component.ts @@ -93,10 +93,14 @@ export class AcknowledgementReceptionComponent implements OnInit { return; } if (this.type === 'notDistributed') { - if (!this.adminFormGroup.get('receivedDate').valid || !this.adminFormGroup.get('returnReason').valid) { + if (!this.adminFormGroup.get('receivedDate').valid) { this.notify.error(this.translate.instant('lang.fieldsNotValid')); return; } + if (!this.adminFormGroup.get('returnReason').valid) { + this.notify.error(this.translate.instant('lang.selectReturnReason')); + return; + } if (this.reason === this.translate.instant('lang.others') && this.functions.empty(this.reasonOther)) { this.notify.error(this.translate.instant('lang.fieldsNotValid')); return; diff --git a/src/lang/lang-en.json b/src/lang/lang-en.json index a8ae8d7a49bc1e39fd60e74514d814c38b1ac707..7aabfd170f2b465aeab07839e4368ff762304d29 100644 --- a/src/lang/lang-en.json +++ b/src/lang/lang-en.json @@ -2019,7 +2019,7 @@ "confirmImportContacts": "Do you want to import <b>{{0}}</b> contacts", "importedContacts": "imported contacts", "registeredMailNotFound": "This registered mail does not exist", - "registeredMailNotInDepositList": "This registered mail is not in a deposit list", + "registeredMailNotInDepositList": "This registered mail is not in a deposit list and so was not sent", "getResId": "Res ID", "getResIdSample": "420", "getBarcode": "Barcode", @@ -2176,5 +2176,6 @@ "templateNameMandatory": "Template name mandatory", "attachmentTypeUsed": "This type is used in attachment", "confirmRescanTitle": "Registered mail not distributed", - "confirmRescan": "This registerde mail was already scanned Not distributed. Do you want to rescan it to distributed ?" + "confirmRescan": "This registerde mail was already scanned Not distributed. Do you want to rescan it to distributed ?", + "selectReturnReason": "Please select a return reason" } diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json index 4cd7cc273033b9e721ba03e9d9f2c55e9571b12b..2e46284dbcf3fa2cc426796a5ecd03bdf672579c 100644 --- a/src/lang/lang-fr.json +++ b/src/lang/lang-fr.json @@ -2021,7 +2021,7 @@ "confirmImportContacts": "Voulez-vous importer <b>{{0}}</b> contacts", "importedContacts": "contacts importés", "registeredMailNotFound": "Ce recommandé n'existe pas", - "registeredMailNotInDepositList": "Ce recommandé n'est pas dans un descriptif de pli", + "registeredMailNotInDepositList": "Ce recommandé n'est pas dans un descriptif de pli et n'a donc pas été envoyé", "toggleEmptyValues": "Prendre en compte les valeurs vides", "emptyValue": "Valeur vide", "templateUsed": "Structure utilisée", @@ -2187,5 +2187,6 @@ "attachmentTypeUsed": "Ce type est utilisé pour certaines pièces jointes", "receptionCanceled": "Réception annulée", "confirmRescanTitle": "Recommandé non distribué", - "confirmRescan": "Ce recommandé a déjà été scanné Non distribué. Voulez-vous le rescanner en distribué ?" + "confirmRescan": "Ce recommandé a déjà été scanné Non distribué. Voulez-vous le rescanner en distribué ?", + "selectReturnReason": "Veuillez sélectionner un motif de retour" }