From 3d2b5c1f83a1781e74fd897e37acb62baead242e Mon Sep 17 00:00:00 2001 From: Marcelo Puebla Date: Thu, 30 Jan 2020 18:18:50 -0300 Subject: [PATCH] Fix Al cerrar modal confirmacion --- src/app/shared/confirmacion/confirmacion.component.ts | 3 ++- .../shared/header-publicidad/header-publicidad.component.ts | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/app/shared/confirmacion/confirmacion.component.ts b/src/app/shared/confirmacion/confirmacion.component.ts index c59f215..8bbb365 100644 --- a/src/app/shared/confirmacion/confirmacion.component.ts +++ b/src/app/shared/confirmacion/confirmacion.component.ts @@ -30,11 +30,12 @@ export class ConfirmacionComponent implements OnInit { } confirmar() { - this.onClose.next(); + this.onClose.next(true); this.modalRef.hide(); } close() { + this.onClose.next(); this.modalRef.hide(); } diff --git a/src/app/shared/header-publicidad/header-publicidad.component.ts b/src/app/shared/header-publicidad/header-publicidad.component.ts index 8205ed0..97725ef 100644 --- a/src/app/shared/header-publicidad/header-publicidad.component.ts +++ b/src/app/shared/header-publicidad/header-publicidad.component.ts @@ -21,6 +21,7 @@ export class HeaderPublicidadComponent implements OnInit { urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`; publicidades: IPublicidad[] = []; modalRef: BsModalRef; + modalSinonimo: BsModalRef; constructor( private publicidadService: PublicidadService, @@ -59,6 +60,7 @@ export class HeaderPublicidadComponent implements OnInit { } openModalPromos(articulo: IArticulo) { + if (this.modalRef) return; this.modalRef = this.modalService.show(PromocionComponent, { initialState: { @@ -69,6 +71,7 @@ export class HeaderPublicidadComponent implements OnInit { } openModalConfirmacion(articulo: IArticulo) { + if (this.modalRef) return; this.articuloService.setArticulosSinImagen([articulo]); this.modalRef = this.modalService.show(ConfirmacionComponent, { @@ -80,9 +83,12 @@ export class HeaderPublicidadComponent implements OnInit { footerConfirmation: articulo.PreVen, footerClose: `volver` }, + ignoreBackdropClick: true, class: 'modal-dialog-centered' }); - this.modalRef.content.onClose.subscribe(() => { + this.modalRef.content.onClose.subscribe((res) => { + this.modalRef = null; + if (!res) return; this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt) .subscribe((res: ISinonimo[]) => { if (res.length) { @@ -103,14 +109,15 @@ export class HeaderPublicidadComponent implements OnInit { } openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) { - const modalSinonimo = this.modalService.show(SinonimoComponent, { + if (this.modalSinonimo) return; + this.modalSinonimo = this.modalService.show(SinonimoComponent, { initialState: { sinonimos: sinonimosData, articulo }, class: 'modal-dialog-centered' }); - modalSinonimo.content.onClose + this.modalSinonimo.content.onClose .subscribe((res: any) => { for (const a of articulo.productos) { for (const aRes of res.articulos) { -- 1.9.1