Skip to content
Snippets Groups Projects
Commit 027e3e25 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FIX #13998 TIME 0:15 fix id issuing site input

parent f8e6c93f
No related branches found
No related tags found
No related merge requests found
......@@ -889,7 +889,7 @@ class RegisteredMailController
if (!empty($registeredMail)) {
$registeredMail['recipient'] = json_decode($registeredMail['recipient'], true);
$registeredMail['number'] = RegisteredMailController::getRegisteredMailNumber(['type' => $registeredMail['type'], 'rawNumber' => $registeredMail['number']]);
$registeredMail['issuingSite'] = 'issuingSite#'.$registeredMail['issuing_site'];
$registeredMail['issuingSite'] = $registeredMail['issuing_site'];
unset($registeredMail['issuing_site']);
}
......
......@@ -8,12 +8,12 @@ import { tap, exhaustMap, catchError, finalize } from 'rxjs/operators';
import { of } from 'rxjs';
@Component({
templateUrl: "save-registered-mail-action.component.html",
templateUrl: 'save-registered-mail-action.component.html',
styleUrls: ['save-registered-mail-action.component.scss'],
})
export class SaveRegisteredMailActionComponent implements OnInit {
loading: boolean = false;
@ViewChild('noteEditor', { static: true }) noteEditor: NoteEditorComponent;
......@@ -42,17 +42,18 @@ export class SaveRegisteredMailActionComponent implements OnInit {
tap((data: any) => {
this.data.resIds = [data.resId];
}),
exhaustMap(() => this.http.put(this.data.indexActionRoute, { resource: this.data.resIds[0], note: this.noteEditor.getNote(),
data: {
type: this.data.resource.registeredMail_type,
warranty: this.data.resource.registeredMail_warranty,
issuingSiteId: this.data.resource.registeredMail_issuingSite.split('#').slice(-1)[0],
letter: this.data.resource.registeredMail_letter,
recipient: this.data.resource.registeredMail_recipient,
reference: this.data.resource.registeredMail_reference,
generated: false
}
})
exhaustMap(() => this.http.put(this.data.indexActionRoute, {
resource: this.data.resIds[0], note: this.noteEditor.getNote(),
data: {
type: this.data.resource.registeredMail_type,
warranty: this.data.resource.registeredMail_warranty,
issuingSiteId: this.data.resource.registeredMail_issuingSite,
letter: this.data.resource.registeredMail_letter,
recipient: this.data.resource.registeredMail_recipient,
reference: this.data.resource.registeredMail_reference,
generated: false
}
})
),
tap(() => {
this.dialogRef.close(this.data.resIds);
......
......@@ -62,7 +62,7 @@ export class IssuingSiteInputComponent implements OnInit {
this.issuingSiteList = data['ranges'].filter((item: any) => item.registeredMailType === registeredMailType && item.status === 'OK' && item.entities.indexOf(this.headerService.user.entities[0].id) > -1).map((item: any) => {
return {
...item,
id : `issuingSite#${item.siteId}`,
id : item.siteId,
label: `${item.label} (${item.customerAccountNumber})`,
disabled: item.fullness === 100,
};
......@@ -77,9 +77,7 @@ export class IssuingSiteInputComponent implements OnInit {
}
setAddress(id: any) {
const siteId = id.split('#').slice(-1)[0];
this.http.get(`../rest/registeredMail/sites/${siteId}`).pipe(
this.http.get(`../rest/registeredMail/sites/${id}`).pipe(
tap((data: any) => {
this.issuingSiteAddress = data['site'];
}),
......
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