Change

Al elegir un articulo

Change
Al elegir un articulo
Marcelo Puebla
1 parent cd64d73a70
Showing 2 changed files with 12 additions and 20 deletions Show diff stats
src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
src/app/shared/promocion/promocion.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) {
@@ -13,7 +13,6 @@ import { InactiveScreenService } from &#39;src/app/services/inactive-screen/inactive
   styleUrls: ['./promocion.component.scss']
 })
 export class PromocionComponent implements OnInit {
-  idArticulo: number;
   articulosPromo: IArticulo[] = [];
   promociones: IArticulo[] = [];
   onClose: Subject<any>;
@@ -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) {
...	...	@@ -129,29 +129,26 @@ export class SeleccionArticulosComponent implements OnInit, OnDestroy {
129	129	}
130	130
131	131	elegirArticulo(articulo: IArticulo) {
132		- if (!articulo.FPP) {
133		- this.getByID(articulo.id);
134		- } else {
135		- this.openModalPromos(articulo);
136		- }
	132	+ this.getByID(articulo.id);
137	133	}
138	134
139	135	getByID(id: number) {
140	136	this.articuloService.getById(id)
141	137	.subscribe((res: IArticulo) => {
142		- res.cantidad = 1;
143		- this.articuloService.setArticulo(res);
	138	+ if (res.FPP) {
	139	+ this.openModalPromos(res);
	140	+ } else {
	141	+ res.cantidad = 1;
	142	+ this.articuloService.setArticulo(res);
	143	+ }
144	144	}, err => console.error(err));
145	145	}
146	146
147	147	openModalPromos(articulo: IArticulo) {
148		- this.modalRef = this.modalService.show(PromocionComponent,
149		- {
150		- initialState: {
151		- idArticulo: articulo.id
152		- },
153		- class: 'modal-promo modal-dialog-centered'
154		- });
	148	+ this.modalRef = this.modalService.show(PromocionComponent, {
	149	+ initialState: { articulosPromo: [articulo] },
	150	+ class: 'modal-promo modal-dialog-centered'
	151	+ });
155	152	}
156	153
157	154	deleteArticulo(index: number) {
...	...	@@ -13,7 +13,6 @@ import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive
13	13	styleUrls: ['./promocion.component.scss']
14	14	})
15	15	export class PromocionComponent implements OnInit {
16		- idArticulo: number;
17	16	articulosPromo: IArticulo[] = [];
18	17	promociones: IArticulo[] = [];
19	18	onClose: Subject<any>;
...	...	@@ -29,11 +28,7 @@ export class PromocionComponent implements OnInit {
29	28	}
30	29
31	30	ngOnInit() {
32		- this.articuloService.getById(this.idArticulo)
33		- .subscribe((res: IArticulo) => {
34		- this.articulosPromo[0] = res;
35		- this.getPromociones();
36		- }, err => console.error(err));
	31	+ this.getPromociones();
37	32	}
38	33
39	34	elegirPromo(promo: IArticulo) {