Marcelo Puebla / autoservicio-axion

Commit 2674b526a0ce91458dff6a66c1126c03e0c909bb

Authored by Marcelo Puebla 2020-01-23 14:55:21 -0300

Exists in develop

Fix - Add

Refactor aplicadas reglas de lint
Seleccion de sinonimos

Showing 11 changed files with 93 additions and 38 deletions Show diff stats

src/app/modules/carrito/carrito.component.ts

Diff comments View file @ 2674b52

 import { Component, OnInit, OnDestroy, HostListener } from '@angular/core';
 import { Location } from '@angular/common';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
 import { Router } from '@angular/router';
 import { BsModalRef } from 'ngx-bootstrap/modal/public_api';
 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
 @Component({
   selector: 'app-carrito',
   templateUrl: './carrito.component.html',
   styleUrls: ['./carrito.component.scss'],
   animations: [
     trigger('EnterLeave', [
       state('flyIn', style({ transform: 'translateX(0)' })),
       transition(':enter', [
         style({ transform: 'translateX(-100%)' }),
         animate('1s ease-in')
       ]),
       transition(':leave', [
         animate('1s ease-out', style({ transform: 'translateX(-100%)' }))
       ])
     ])
   ]
 })
 export class CarritoComponent implements OnInit, OnDestroy {
   urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
   maxCantidad = 50;
   modalRef: BsModalRef;
   constructor(
     public articuloService: ArticuloService,
     private location: Location,
     private router: Router,
     private inactiveScreen: InactiveScreenService,
   ) { }
   ngOnInit() {
     if (!this.articuloService.carrito.length) {
       this.router.navigate(['']);
       return;
     }
-    this.mediaPantallaP()
+    this.mediaPantallaP();
   }
   ngOnDestroy() {
     if (this.modalRef) this.modalRef.hide();
   }
   deleteArticulo(index: number) {
-    this.articuloService.carrito.splice(index, 1);
+    this.articuloService.deleteArticulo(index);
-    this.articuloService.calcularTotal();
   }
   substractCant(articulo: IArticulo) {
     if (articulo.cantidad === 1) return;
     articulo.cantidad--;
     this.articuloService.calcularTotal();
   }
   addCant(articulo: IArticulo) {
     if (articulo.cantidad >= this.maxCantidad) return;
     articulo.cantidad++;
     this.articuloService.calcularTotal();
   }
   goBack() {
     this.location.back();
   }
   @HostListener('document:click', ['$event'])
   eventListener(event: Event) {
     clearTimeout(this.inactiveScreen.timerReposo);
     this.inactiveScreen.startTimeOutInactividad();
   }
+  @HostListener('scroll', ['$event'])
+  scrollEvent(event: Event) {
+    clearTimeout(this.inactiveScreen.timerReposo);
+    this.inactiveScreen.startTimeOutInactividad();
+  }
   mediaPantallaP() {
     if ($('body').hasClass('media-pantalla')) {
       $('.carrito-content,.carrito-articulo').addClass('media-pantalla');
     }
   }
 }

src/app/modules/forma-pago/forma-pago.component.ts

Diff comments View file @ 2674b52

1	import { Component, OnInit } from "@angular/core";	1	import { Component, OnInit } from '@angular/core';
2	import { ArticuloService } from "src/app/services/articulo/articulo.service";	2	import { ArticuloService } from 'src/app/services/articulo/articulo.service';
3	import { Router } from "@angular/router";	3	import { Router } from '@angular/router';
4		4
5	@Component({	5	@Component({
6	selector: "app-forma-pago",	6	selector: 'app-forma-pago',
7	templateUrl: "./forma-pago.component.html",	7	templateUrl: './forma-pago.component.html',
8	styleUrls: ["./forma-pago.component.scss"]	8	styleUrls: ['./forma-pago.component.scss']
9	})	9	})
10	export class FormaPagoComponent implements OnInit {	10	export class FormaPagoComponent implements OnInit {
11	constructor(	11	constructor(
12	private articuloService: ArticuloService,	12	private articuloService: ArticuloService,
13	private router: Router	13	private router: Router
14	) {}	14	) {}
15		15
16	ngOnInit() {	16	ngOnInit() {
17	if (!this.articuloService.carrito.length) {	17	if (!this.articuloService.carrito.length) {
18	this.router.navigate([""]);	18	this.router.navigate(['']);
19	return;	19	return;
20	}	20	}
21	this.mediaPantalla();	21	this.mediaPantalla();
22	}	22	}
23		23
24	medioPago(medioPago: number) {	24	medioPago(medioPago: number) {
25	this.articuloService.medioPago = medioPago;	25	this.articuloService.medioPago = medioPago;
26	switch (medioPago) {	26	switch (medioPago) {
27	case 4:	27	case 4:
28	this.router.navigate(["pago-tarjeta"]);	28	this.router.navigate(['pago-tarjeta']);
29	break;	29	break;
30	case 9:	30	case 9:
31	this.router.navigate(["pago-electronico"]);	31	this.router.navigate(['pago-electronico']);
32	break;	32	break;
33	}	33	}
34	}	34	}
35		35
36	mediaPantalla() {	36	mediaPantalla() {
37	if ($('body').hasClass('media-pantalla')) {	37	if ($('body').hasClass('media-pantalla')) {
38	$('.reduce-card-1,.reduce-card-2').addClass('media-pantalla');	38	$('.reduce-card-1,.reduce-card-2').addClass('media-pantalla');
39	}	39	}
40	}	40	}
41	}	41	}
42		42

src/app/modules/info-formas-pago/info-formas-pago.component.ts

Diff comments View file @ 2674b52

1	import { Component, OnInit } from '@angular/core';	1	import { Component, OnInit } from '@angular/core';
2		2
3	@Component({	3	@Component({
4	selector: 'app-formas-pago',	4	selector: 'app-formas-pago',
5	templateUrl: './info-formas-pago.component.html',	5	templateUrl: './info-formas-pago.component.html',
6	styleUrls: ['./info-formas-pago.component.scss']	6	styleUrls: ['./info-formas-pago.component.scss']
7	})	7	})
8	export class InfoFormasPagoComponent implements OnInit {	8	export class InfoFormasPagoComponent implements OnInit {
9	mediaPantalla = false;	9	mediaPantalla = false;
10		10
11	constructor() {}	11	constructor() { }
12		12
13	ngOnInit() {	13	ngOnInit() {
14	this.reducirPantalla();	14	this.reducirPantalla();
15	}	15	}
16		16
17	reducirPantalla() {	17	reducirPantalla() {
18	if ($('body').hasClass('media-pantalla')) {	18	if ($('body').hasClass('media-pantalla')) {
19	$('.reduce-card-1,.reduce-card-2').addClass('media-pantalla');	19	$('.reduce-card-1,.reduce-card-2').addClass('media-pantalla');
20	}	20	}
21	}	21	}
22	}	22	}
23		23

src/app/modules/seleccion-articulos/seleccion-articulos.component.ts

Diff comments View file @ 2674b52

 import { Component, OnInit, TemplateRef, OnDestroy, HostListener } from '@angular/core';
 import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
 import { ICategoria } from 'src/app/interfaces/ICategoria';
 import { ISinonimo } from 'src/app/interfaces/ISinonimo';
 import { CategoriaService } from 'src/app/services/categoria/categoria.service';
 import { PromocionService } from 'src/app/services/promocion/promocion.service';
 import { PromocionComponent } from 'src/app/shared/promocion/promocion.component';
 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
 import { SinonimoService } from 'src/app/services/sinonimo/sinonimo.service';
 import { SinonimoComponent } from 'src/app/shared/sinonimo/sinonimo.component';
 @Component({
   selector: 'app-seleccion-articulos',
   templateUrl: './seleccion-articulos.component.html',
   styleUrls: ['./seleccion-articulos.component.scss']
 })
 export class SeleccionArticulosComponent implements OnInit, OnDestroy {
   showSpinner = true;
   timeoutHandler: any;
   urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
   articulos: IArticulo[] = [];
   auxArticulos: IArticulo[] = [];
   showQuantity = 100;
   queMostrar = 'todos';
   categoriaActive = null;
   categorias: ICategoria[] = [];
   searchTerm = '';
   ordenandoByVendidos = true;
   allActive = true;
   modalRef: BsModalRef;
   total = 0;
   constructor(
     public articuloService: ArticuloService,
     private categoriaService: CategoriaService,
     private sinonimoService: SinonimoService,
     private modalService: BsModalService,
     private inactiveScreen: InactiveScreenService,
   ) { }
   ngOnInit() {
     this.getCategorias();
     this.mediaPantalla();
   }
   ngOnDestroy() {
     if (this.modalRef) this.modalRef.hide();
   }
   getCategorias() {
     this.categoriaService.getAll()
       .subscribe((categorias: ICategoria[]) => {
         switch (this.queMostrar) {
           case 'todos':
             this.categorias = categorias;
             this.categoriaActive = 0;
             break;
           case 'promociones':
             this.categorias = categorias;
             this.categoriaActive = 19;
             break;
           case 'ordenar':
             this.categorias = categorias.filter((categoria: ICategoria) => {
               return categoria.ES_PEDIDO;
             });
             this.categoriaActive = 4;
             break;
           default:
             this.categorias = categorias;
             this.categoriaActive = 0;
             break;
         }
         !localStorage.getItem('articulos') ?
           this.getProductos() :
           this.setProductos();
       });
   }
   getProductos() {
     this.articuloService.getAll()
       .subscribe((result: IArticulo[]) => {
         this.articuloService.setArticulosSinImagen(result);
         if (this.queMostrar === 'ordenar') {
           this.categorias.forEach((categoria: ICategoria) => {
             const tempArticulos = result.filter((articulo: IArticulo) => {
               return articulo.categoria_selfservice === categoria.id;
             });
             result = tempArticulos;
           });
         }
         localStorage.setItem('articulos', JSON.stringify(result));
         this.setProductos();
       }, (error) => {
         this.showSpinner = false;
         console.error(error);
       });
   }
   setProductos() {
     this.articulos = JSON.parse(localStorage.getItem('articulos'));
     this.filterItems();
   }
   filterItems() {
     if (this.categoriaActive === 0) {
       this.auxArticulos = this.articulos;
       return;
     }
     this.auxArticulos = this.articulos.filter(x => {
       return x.categoria_selfservice === this.categoriaActive;
     });
     this.ordenar();
   }
   ordenar() {
     if (this.ordenandoByVendidos) {
       this.auxArticulos.sort((a, b) => {
         return b.cantidadVendida - a.cantidadVendida;
       });
     }
   }
   selectCategoria(index: number, idCategoria?: number) {
     if (this.categoriaActive === idCategoria) return;
     this.categoriaActive = idCategoria;
     this.allActive = idCategoria === 0 ? true : false;
     this.categorias.forEach((categoria, i) => {
       categoria.selected = index === i ? true : false;
     });
     this.filterItems();
   }
   selectArticulo(articulo: IArticulo) {
     this.getByID(articulo.id);
   }
   getByID(id: number) {
     this.articuloService.getById(id)
       .subscribe((res: IArticulo) => {
         if (res.FPP) {
           this.openModalPromos(res);
         } else {
           this.getSinonimos(res);
         }
       }, err => console.error(err));
   }
   getSinonimos(articulo: IArticulo) {
     this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt)
       .subscribe((res: ISinonimo[]) => {
         if (res.length) {
           this.openModalSinonimos(res);
         } else {
-          articulo.cantidad = 1;
           this.articuloService.setArticulo(articulo);
         }
-      })
+      });
   }
   openModalPromos(articulo: IArticulo) {
     this.modalRef = this.modalService.show(PromocionComponent, {
       initialState: { articulosPromo: [articulo] },
       class: 'modal-promo modal-dialog-centered'
     });
   }
   openModalSinonimos(sinonimosData: ISinonimo[]) {
     this.modalRef = this.modalService.show(SinonimoComponent, {
       initialState: { sinonimos: sinonimosData },
       class: 'modal-promo modal-dialog-centered'
     });
+    this.modalRef.content.onClose
+      .subscribe((articulo: IArticulo) => {
+        this.articuloService.setArticulo(articulo);
+      });
   }
   deleteArticulo(index: number) {
-    this.articuloService.carrito.splice(index, 1);
+    this.articuloService.deleteArticulo(index);
-    this.articuloService.calcularTotal();
   }
   increaseShow() {
     this.showQuantity += 100;
   }
   @HostListener('scroll', ['$event'])
   scrollEvent(event: Event) {
     clearTimeout(this.inactiveScreen.timerReposo);
     this.inactiveScreen.startTimeOutInactividad();
   }
   mouseup() {
     if (!this.timeoutHandler) return;
     clearInterval(this.timeoutHandler);
   }
   scrollY(el: HTMLElement, value) {
     el.scroll({ behavior: 'smooth', top: value + el.scrollTop });
     this.timeoutHandler = setInterval(() => {
       el.scroll({ behavior: 'smooth', top: value + el.scrollTop });
     }, 500);
   }
   scrollX(el: HTMLElement, value) {
     el.scroll({ behavior: 'smooth', left: value + el.scrollLeft });
     this.timeoutHandler = setInterval(() => {
       el.scroll({ behavior: 'smooth', left: value + el.scrollLeft });
     }, 500);
   }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $('.cat-content,#content,.cat-btn,#boxCarrito,.cat-box,.img-categoria').addClass('media-pantalla').addBack('media-pantalla');
     }
   }

src/app/modules/splash-screen/splash-screen.component.ts

Diff comments View file @ 2674b52

1	import { Component, OnInit } from "@angular/core";	1	import { Component, OnInit } from '@angular/core';
2		2
3	@Component({	3	@Component({
4	selector: "app-splash-screen",	4	selector: 'app-splash-screen',
5	templateUrl: "./splash-screen.component.html",	5	templateUrl: './splash-screen.component.html',
6	styleUrls: ["./splash-screen.component.scss"]	6	styleUrls: ['./splash-screen.component.scss']
7	})	7	})
8	export class SplashScreenComponent implements OnInit {	8	export class SplashScreenComponent implements OnInit {
9	timerSplashScreen = 2000;	9	timerSplashScreen = 2000;
10	showSplashScreen = true;	10	showSplashScreen = true;
11	textWelcome = "BIENVENIDO A SPOT!";	11	textWelcome = 'BIENVENIDO A SPOT!';
12	textComoEstas = "¿cómo estás?";	12	textComoEstas = '¿cómo estás?';
13	textInvitamos = "TE INVITAMOS A HACER";	13	textInvitamos = 'TE INVITAMOS A HACER';
14	textTuPedido = "tu pedido acá";	14	textTuPedido = 'tu pedido acá';
15		15
16	constructor() {}	16	constructor() {}
17		17
18	ngOnInit() {	18	ngOnInit() {
19	localStorage.clear();	19	localStorage.clear();
20	setTimeout(() => {	20	setTimeout(() => {
21	this.showSplashScreen = false;	21	this.showSplashScreen = false;
22	}, this.timerSplashScreen);	22	}, this.timerSplashScreen);
23	$('body').removeClass('media-pantalla');	23	$('body').removeClass('media-pantalla');
24	}	24	}
25	}	25	}
26		26

src/app/services/articulo/articulo.service.ts

Diff comments View file @ 2674b52

 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { APP_SETTINGS } from '../../../etc/AppSettings';
 import { IArticulo } from '../../interfaces/IArticulo';
 import { ClienteService } from '../cliente/cliente.service';
 import { Observable } from 'rxjs';
 @Injectable()
 export class ArticuloService {
   carrito: IArticulo[] = [];
   articuloAcargar: IArticulo;
   promoAcargar: IArticulo;
   mostrar: string;
   esPromoPersonalizada = false;
   urlDeboSuite = APP_SETTINGS.apiDeboSuite;
   medioPago: number;
   idComanda: number;
   subTotal = 0;
   constructor(
     private http: HttpClient,
     private clienteService: ClienteService,
   ) { }
   getById(id) {
     return this.http.get(`${this.urlDeboSuite}/articulos/${id}`);
   }
   getAll() {
     return this.http.get(`${this.urlDeboSuite}/articulos/`);
   }
   getAllWithPaginator(page: number = 1) {
     return this.http.get(`${this.urlDeboSuite}/articulos/${page}`);
   }
   calcularTotal() {
     this.subTotal = 0;
     this.carrito.forEach(articulo => {
       this.subTotal += (articulo.PreVen * articulo.cantidad);
     });
   }
   setArticulo(articulo: IArticulo) {
+    articulo.cantidad = 1;
     for (const articuloCarrito of this.carrito) {
       if (articuloCarrito.id === articulo.id) {
         articuloCarrito.cantidad++;
         this.calcularTotal();
         return;
       }
     }
     this.setArticulosSinImagen([articulo]);
     this.carrito.unshift(articulo);
     this.calcularTotal();
   }
+  deleteArticulo(index: number) {
+    this.carrito.splice(index, 1);
+    this.calcularTotal();
+  }
   pay(dataPago: any) {
     return new Observable((observer) => {
       this.clienteService.getById(-1)
         .subscribe(cliente => {
           this.markArticuloInPromoAsRemoved();
           this.http.post(`${this.urlDeboSuite}/comprobante/guardar/${this.medioPago}`, {
             productos: this.carrito,
             cliente,
             origen: 'autoservicio',
             codigoVendedor: 5,
             puntoVenta: APP_SETTINGS.puntoVenta,
             pedidoAnombreDe: dataPago.pedidoAnombreDe,
             numeroPlanilla: APP_SETTINGS.numeroPlanilla,
           })
             .subscribe((data) => {
               observer.next(data);
               observer.complete();
             });
         });
     });
   }
   cleanShoppingCar() {
     this.articuloAcargar = undefined;
     this.promoAcargar = undefined;
     this.carrito = [];
   }
   setArticulosSinImagen(articulos: IArticulo[]) {
     articulos.forEach((articulo: IArticulo) => {
       articulo.imagenes = !articulo.imagenes ? [{ imagen: 'noImage.jpg' }] :
         !articulo.imagenes.length ? [{ imagen: 'noImage.jpg' }] : articulo.imagenes;
     });
   }
   markArticuloInPromoAsRemoved() {
     this.carrito.forEach((articuloCarrito: IArticulo) => {
       if (articuloCarrito.PRO) {
         articuloCarrito.productos.forEach((articulo: IArticulo) => {
           if (articulo.cantidadAdicionada === 0) {
             articulo.cantidad = 0;
             articulo.importeValorExtra = 0;
           }
         });
       }
     });
   }
 }

src/app/shared/footer/footer.component.ts

Diff comments View file @ 2674b52

 import { Component, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
 @Component({
   selector: 'app-footer',
   templateUrl: './footer.component.html',
   styleUrls: ['./footer.component.scss']
 })
 export class FooterComponent implements OnInit {
-  constructor(private location: Location) {}
+  constructor(private location: Location) { }
-  ngOnInit() {}
+  ngOnInit() { }
   goBack() {
     this.location.back();
   }
   reducirPantalla() {
-    $('body,.reduce-card-1,.reduce-card-2,#content,.cat-content,.cat-btn,.cat-box,#boxCarrito,#headerPublicidad,#headerPad,.img-categoria,.carrito-articulo,.carrito-content,.pago-tarjeta,.modal-promo').toggleClass('media-pantalla');
+    $(`
+      body,
+      .reduce-card-1,
+      .reduce-card-2,
+      #content,
+      .cat-content,
+      .cat-btn,
+      .cat-box,
+      #boxCarrito,
+      #headerPublicidad,
+      #headerPad,
+      .img-categoria,
+      .carrito-articulo,
+      .carrito-content,
+      .pago-tarjeta,
+      .modal-promo`)
+      .toggleClass('media-pantalla');
   }
 }

src/app/shared/header-publicidad/header-publicidad.component.ts

Diff comments View file @ 2674b52

 import { Component, OnInit, TemplateRef } from '@angular/core';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
 import { IPublicidad } from 'src/app/interfaces/IPublicidad';
 import { PublicidadService } from 'src/app/services/publicidad/publicidad.service';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
 import { PromocionComponent } from '../promocion/promocion.component';
 import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { ConfirmacionComponent } from '../confirmacion/confirmacion.component';
 @Component({
   selector: 'app-header-publicidad',
   templateUrl: './header-publicidad.component.html',
   styleUrls: ['./header-publicidad.component.scss']
 })
 export class HeaderPublicidadComponent implements OnInit {
   urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
   publicidades: IPublicidad[] = [];
   modalRef: BsModalRef;
   constructor(
     private publicidadService: PublicidadService,
     private articuloService: ArticuloService,
     private modalService: BsModalService,
   ) { }
   ngOnInit() {
     this.getPublicidades();
     this.mediaPantalla();
   }
   getPublicidades() {
     this.publicidadService.getAll()
       .subscribe((res: IPublicidad[]) => {
         this.publicidades = res;
       }, err => console.error(err));
   }
   elegirArticulo(publicidad: IPublicidad) {
     if (publicidad.id_articulo) this.getByID(publicidad.id_articulo);
   }
   getByID(id: number) {
     this.articuloService.getById(id)
       .subscribe((res: IArticulo) => {
         if (res.FPP) {
           this.openModalPromos(res);
           return;
         } else {
           this.openModalConfirmacion(res);
           return;
         }
       }, err => console.error(err));
   }
   openModalPromos(articulo: IArticulo) {
     this.modalRef = this.modalService.show(PromocionComponent,
       {
         initialState: {
           idArticulo: articulo.id
         },
         class: 'modal-promo modal-dialog-centered'
       });
   }
   openModalConfirmacion(articulo: IArticulo) {
     this.modalRef = this.modalService.show(ConfirmacionComponent,
       {
         initialState: {
           titleMessage: articulo.DET_LAR,
           imagenPath: articulo.imagenes,
           footerMessageFirst: `¿DESEA AGREGAR ESTE ARTÍCULO`,
           footerMessageSecond: `a su carrito?`,
           footerConfirmation: articulo.PreVen,
           footerClose: `volver`
         },
         class: 'modal-promo modal-dialog-centered'
       });
     this.modalRef.content.onClose.subscribe(() => {
-      articulo.cantidad = 1;
       this.articuloService.setArticulo(articulo);
     });
   }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $('#headerPublicidad,#headerPad').addClass('media-pantalla');
     }
   }
 }

src/app/shared/promocion/promocion.component.ts

Diff comments View file @ 2674b52

 import { Component, OnInit, HostListener } from '@angular/core';
 import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { PromocionService } from 'src/app/services/promocion/promocion.service';
 import { Subject } from 'rxjs';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
 import { SinonimoService } from 'src/app/services/sinonimo/sinonimo.service';
 import { ISinonimo } from 'src/app/interfaces/ISinonimo';
 import { SinonimoComponent } from '../sinonimo/sinonimo.component';
 @Component({
   selector: 'app-promocion',
   templateUrl: './promocion.component.html',
   styleUrls: ['./promocion.component.scss']
 })
 export class PromocionComponent implements OnInit {
   articulosPromo: IArticulo[] = [];
   promociones: IArticulo[] = [];
   onClose: Subject<any>;
   urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
   constructor(
-    public modalRef: BsModalRef,
+    public modalPromocion: BsModalRef,
     private modalService: BsModalService,
     private articuloService: ArticuloService,
     private promocionService: PromocionService,
     private sinonimoService: SinonimoService,
     private inactiveScreen: InactiveScreenService,
   ) {
     this.onClose = new Subject();
   }
   ngOnInit() {
     this.getPromociones();
   }
   selectPromo(promo: IArticulo) {
     this.sinonimoService.getSinonimos(promo.CodSec, promo.CodArt)
       .subscribe((res: ISinonimo[]) => {
         if (res.length) {
           this.openModalSinonimos(res);
         } else {
           promo.cantidad = 1;
           this.articuloService.setArticulo(promo);
-          this.modalRef.hide();
+          this.modalPromocion.hide();
         }
       }, err => console.error(err));
     this.mediaPantalla();
   }
   openModalSinonimos(sinonimosData: ISinonimo[]) {
-    this.modalRef = this.modalService.show(SinonimoComponent, {
+    const modalSinonimo = this.modalService.show(SinonimoComponent, {
       initialState: { sinonimos: sinonimosData },
       class: 'modal-promo modal-dialog-centered'
     });
+    modalSinonimo.content.onClose
+      .subscribe((articulo: IArticulo) => {
+        this.articuloService.setArticulo(articulo);
+        this.modalPromocion.hide();
+      });
   }
   getPromociones() {
     const sector = this.articulosPromo[0].CodSec;
     const codigo = this.articulosPromo[0].CodArt;
     this.promocionService.getPromociones(sector, codigo)
       .subscribe((res: IArticulo[]) => {
         this.promociones = res;
       }, error => { console.error(error); });
   }
   @HostListener('document:click', ['$event'])
   eventListener(event: Event) {
     clearTimeout(this.inactiveScreen.timerReposo);
     this.inactiveScreen.startTimeOutInactividad();
   }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $('.modal-content').addClass('media-pantalla');
     }
   }
 }

src/app/shared/sinonimo/sinonimo.component.html

Diff comments View file @ 2674b52

 <div class="bg-primary rounded text-white">
   <div class="modal-header">
     <p class="h4">Seleccione sinonimos</p>
   </div>
   <div class="modal-body">
     <div
       class="lista-sinonimos scroll-y-visible"
       *ngFor="let s of sinonimos">
       <div *ngFor="let articulo of s.productos">
         <div class="custom-control custom-checkbox">
           <input
             type="checkbox"
             class="custom-control-input"
             [(ngModel)]="articulo.seleccionado"
             (click)="selectArticulo(articulo)"
             [id]="articulo.id">
           <label
             class="custom-control-label"
             [for]="articulo.id">
             {{articulo.DET_LAR}}
           </label>
         </div>
       </div>
     </div>
   </div>
   <div class="modal-footer">
     <div
       [ngClass]="validate()"
-      class="d-inline-block py-1 btn-effect bg-white badge-pill text-primary">
+      class="d-inline-block py-1 btn-effect bg-white badge-pill text-primary"
+      (click)="continue()">
       CONTINUAR
       <img
         draggable="false"
         ondragstart="return false;"
         (contextmenu)="false"
         class="icon-30"
         src="assets/img/ir-color.svg">
     </div>
   </div>
 </div>

src/app/shared/sinonimo/sinonimo.component.ts

Diff comments View file @ 2674b52

 import { Component, OnInit } from '@angular/core';
 import { ISinonimo } from 'src/app/interfaces/ISinonimo';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
+import { BsModalRef } from 'ngx-bootstrap/modal';
+import { Subject } from 'rxjs';
+import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 @Component({
   selector: 'app-sinonimo',
   templateUrl: './sinonimo.component.html',
   styleUrls: ['./sinonimo.component.scss']
 })
 export class SinonimoComponent implements OnInit {
   sinonimos: ISinonimo[] = [];
   isValid: boolean;
+  onClose: Subject<any>;
+  articuloSelected: IArticulo;
-  constructor() { }
+  constructor(
+    private modalRef: BsModalRef,
+    private articuloService: ArticuloService,
+  ) {
+    this.onClose = new Subject();
+  }
   ngOnInit() {
   }
   selectArticulo(articulo: IArticulo) {
     for (const s of this.sinonimos) {
-      for (const articulo of s.productos) {
+      for (const a of s.productos) {
-        articulo.seleccionado = false;
+        a.seleccionado = false;
       }
     }
     articulo.seleccionado = true;
+    this.articuloSelected = articulo;
   }
   validate() {
     this.isValid = false;
     for (const s of this.sinonimos) {
       for (const articulo of s.productos) {
         if (articulo.seleccionado) {
           this.isValid = true;
         }
       }
     }
     return !this.isValid ? 'disabled' : '';
   }
+  continue() {
+    this.articuloService.getById(this.articuloSelected.id)
+      .subscribe((res: IArticulo) => {
+        this.modalRef.hide();
+        this.onClose.next(res);
+      });
+  }
 }