diff --git a/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts b/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts index e8842ac..ad34ce5 100644 --- a/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts +++ b/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts @@ -129,29 +129,26 @@ export class SeleccionArticulosComponent implements OnInit, OnDestroy { } elegirArticulo(articulo: IArticulo) { - if (!articulo.FPP) { - this.getByID(articulo.id); - } else { - this.openModalPromos(articulo); - } + this.getByID(articulo.id); } getByID(id: number) { this.articuloService.getById(id) .subscribe((res: IArticulo) => { - res.cantidad = 1; - this.articuloService.setArticulo(res); + if (res.FPP) { + this.openModalPromos(res); + } else { + res.cantidad = 1; + this.articuloService.setArticulo(res); + } }, err => console.error(err)); } openModalPromos(articulo: IArticulo) { - this.modalRef = this.modalService.show(PromocionComponent, - { - initialState: { - idArticulo: articulo.id - }, - class: 'modal-promo modal-dialog-centered' - }); + this.modalRef = this.modalService.show(PromocionComponent, { + initialState: { articulosPromo: [articulo] }, + class: 'modal-promo modal-dialog-centered' + }); } deleteArticulo(index: number) { diff --git a/src/app/shared/promocion/promocion.component.ts b/src/app/shared/promocion/promocion.component.ts index 9647852..fb08562 100644 --- a/src/app/shared/promocion/promocion.component.ts +++ b/src/app/shared/promocion/promocion.component.ts @@ -13,7 +13,6 @@ import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive styleUrls: ['./promocion.component.scss'] }) export class PromocionComponent implements OnInit { - idArticulo: number; articulosPromo: IArticulo[] = []; promociones: IArticulo[] = []; onClose: Subject; @@ -29,11 +28,7 @@ export class PromocionComponent implements OnInit { } ngOnInit() { - this.articuloService.getById(this.idArticulo) - .subscribe((res: IArticulo) => { - this.articulosPromo[0] = res; - this.getPromociones(); - }, err => console.error(err)); + this.getPromociones(); } elegirPromo(promo: IArticulo) {