Skip to content
Snippets Groups Projects
Commit 3f0bb99e authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

FEAT #14004 TIME 0:40 remove default type

parent eaa6b2a2
No related branches found
No related tags found
No related merge requests found
......@@ -171,13 +171,14 @@ 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 = str_replace(' ', '', $number);
$registeredMail = RegisteredMailModel::get([
'select' => ['id', 'res_id', 'received_date'],
'where' => ['number = ?'],
'data' => [$number]
'where' => ['number = ?', 'type = ?'],
'data' => [$number, $type]
]);
if (empty($registeredMail)) {
return $response->withStatus(400)->withJson(['errors' => 'Registered mail number not found']);
......
......@@ -52,7 +52,7 @@
<input matInput name="returnReasonOther" formControlName="returnReasonOther" [(ngModel)]="reasonOther">
</mat-form-field>
<mat-form-field>
<mat-form-field *ngIf="type === 'notDistributed' || type === 'distributed'">
<mat-label>{{'lang.registeredMailNumber' | translate}}</mat-label>
<input #numberInput type="text" matInput required [(ngModel)]="number" formControlName="number">
</mat-form-field>
......
......@@ -21,7 +21,7 @@ export class AcknowledgementReceptionComponent implements OnInit {
today: Date = new Date();
type: any = 'distributed';
type: any;
number: any;
receivedDate: any = this.today;
reason: any;
......@@ -60,8 +60,8 @@ export class AcknowledgementReceptionComponent implements OnInit {
this.adminFormGroup = this._formBuilder.group({
type: ['', Validators.required],
number: ['', validatorNumber],
receivedDate: ['', Validators.required],
returnReason: ['', Validators.required],
receivedDate: [''],
returnReason: [''],
returnReasonOther: ['']
});
this.loading = false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment