From 2faef52ed0128c936c0e8bcc970db4421fc59028 Mon Sep 17 00:00:00 2001 From: mpuebla Date: Thu, 6 Feb 2020 22:49:19 -0300 Subject: [PATCH] Fix en seleccion de sinonimo --- .../seleccion-articulos/seleccion-articulos.component.ts | 8 +------- .../header-publicidad/header-publicidad.component.ts | 9 ++------- src/app/shared/promocion/promocion.component.ts | 8 +------- src/app/shared/sinonimo/sinonimo.component.ts | 16 +++++++++------- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts b/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts index 0b0a0d5..1a88717 100644 --- a/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts +++ b/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts @@ -158,13 +158,7 @@ export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDes .subscribe((res: any) => { this.modalRef = null; if (!res) return; - for (const a of articulo.productos) { - for (const aRes of res.articulos) { - if (a.idSinonimo === aRes.ID_SIN) { - this.articuloService.changeArticulo(a, aRes); - } - } - } + articulo.productos = res.articulos; this.articuloService.setArticulo(articulo); }); this.mediaPantalla(); diff --git a/src/app/shared/header-publicidad/header-publicidad.component.ts b/src/app/shared/header-publicidad/header-publicidad.component.ts index 2efd842..0f32633 100644 --- a/src/app/shared/header-publicidad/header-publicidad.component.ts +++ b/src/app/shared/header-publicidad/header-publicidad.component.ts @@ -119,13 +119,8 @@ export class HeaderPublicidadComponent implements OnInit { this.modalSinonimo.content.onClose .subscribe((res: any) => { this.modalSinonimo = null; - for (const a of articulo.productos) { - for (const aRes of res.articulos) { - if (a.idSinonimo === aRes.ID_SIN) { - this.articuloService.changeArticulo(a, aRes); - } - } - } + if (!res) return; + articulo.productos = res.articulos; this.articuloService.setArticulo(articulo); }); } diff --git a/src/app/shared/promocion/promocion.component.ts b/src/app/shared/promocion/promocion.component.ts index db12ac7..5f1d20b 100644 --- a/src/app/shared/promocion/promocion.component.ts +++ b/src/app/shared/promocion/promocion.component.ts @@ -86,13 +86,7 @@ export class PromocionComponent implements OnInit { this.modalPromocion.hide(); return; } - for (const a of articulo.productos) { - for (const aRes of res.articulos) { - if (a.idSinonimo === aRes.ID_SIN) { - this.articuloService.changeArticulo(a, aRes); - } - } - } + articulo.productos = res.articulos; this.articuloService.setArticulo(articulo); this.onClose.next(); this.modalPromocion.hide(); diff --git a/src/app/shared/sinonimo/sinonimo.component.ts b/src/app/shared/sinonimo/sinonimo.component.ts index 672202c..9639046 100644 --- a/src/app/shared/sinonimo/sinonimo.component.ts +++ b/src/app/shared/sinonimo/sinonimo.component.ts @@ -49,18 +49,20 @@ export class SinonimoComponent implements OnInit { if (!this.isValid) return; if (this.isSinonimoSelected) return; this.isSinonimoSelected = true; - const ID_SINS = []; const observables = []; + const cantidades = []; - // for (const articulo of this.articulosSelected) { - // ID_SINS.push(articulo.ID_SIN); - // observables.push(this.articuloService.getById(articulo.id)); - // } - + for (const s of this.sinonimos) { + for (const articulo of s.productos) { + if (articulo.cantidad === 0) continue; + cantidades.push(articulo.cantidad); + observables.push(this.articuloService.getById(articulo.id)); + } + } forkJoin(observables) .subscribe((res: IArticulo[]) => { res.forEach((articulo, i) => { - articulo.ID_SIN = ID_SINS[i]; + articulo.cantidad = cantidades[i]; }); this.modalRef.hide(); this.onClose.next({ -- 1.9.1