Luis Suarez / autoservicio-axion

Commit 5ecbcd777de6bb23ab4e2f05850e3c4389fba70b

Authored by Marcelo Puebla 2020-01-23 16:26:49 -0300

Exists in develop

Add

Seleccionar sinonimos.

Showing 5 changed files with 44 additions and 12 deletions Show diff stats

src/app/interfaces/IArticulo.ts

Diff comments View file @ 5ecbcd7

 export interface IArticulo {
   cantidad?: number;
   cantidadAdicionada?: number;
   cantidadVendida?: number;
   categoria_selfservice?: number;
   CodArt: number;
   codigoBarra?: ICodigoBarra[];
   CodSec: number;
   DetArt: string;
   DET_LAR: string;
   ELBPRO: string;
   esAdicionable?: boolean;
   esSustraible?: boolean;
   FPP?: boolean;
   id: number;
   idSinonimo?: number;
+  ID_SIN?: number;
   imagenes?: any[];
   ImpInt: number;
   ImpInt2: number;
   ImpInt3: number;
   importeValorExtra?: number;
   PreVen: number;
   PRO: boolean;
   productos?: IArticulo[];
   seleccionado?: boolean;
   tieneSinonimo?: boolean;
   tipo_articulo?: number;
-  comentario?: string;
+  CODA?: number;
+  CODP?: number;
+  SECA?: number;
+  SECP?: number;
 }
 export interface ICodigoBarra {
   CodBar: string;
   CodArt: number;
   CodSec: string;
 }

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

Diff comments View file @ 5ecbcd7

-import { Component, OnInit, TemplateRef, OnDestroy, HostListener } from '@angular/core';
+import { Component, OnInit, 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);
+          this.openModalSinonimos(res, articulo);
         } else {
           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[]) {
+  openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
     this.modalRef = this.modalService.show(SinonimoComponent, {
       initialState: { sinonimos: sinonimosData },
       class: 'modal-promo modal-dialog-centered'
     });
     this.modalRef.content.onClose
-      .subscribe((articulo: IArticulo) => {
+      .subscribe((res: any) => {
+        for (const a of articulo.productos) {
+          if (a.idSinonimo === res.ID_SIN) {
+            a.CODA = res.articulo.CodArt;
+            a.CodArt = res.articulo.CodArt;
+            a.SECA = res.articulo.CodSec;
+            a.CodSec = res.articulo.CodSec;
+            a.PreVen = res.articulo.PreVen;
+            a.id = res.articulo.id;
+            a.DET_LAR = res.articulo.DET_LAR;
+            a.DetArt = res.articulo.DetArt;
+          }
+        }
         this.articuloService.setArticulo(articulo);
       });
   }
   deleteArticulo(index: number) {
     this.articuloService.deleteArticulo(index);
   }
   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/services/articulo/articulo.service.ts

Diff comments View file @ 5ecbcd7

1	import { Injectable } from '@angular/core';	1	import { Injectable } from '@angular/core';
2	import { HttpClient } from '@angular/common/http';	2	import { HttpClient } from '@angular/common/http';
3	import { APP_SETTINGS } from '../../../etc/AppSettings';	3	import { APP_SETTINGS } from '../../../etc/AppSettings';
4	import { IArticulo } from '../../interfaces/IArticulo';	4	import { IArticulo } from '../../interfaces/IArticulo';
5	import { ClienteService } from '../cliente/cliente.service';	5	import { ClienteService } from '../cliente/cliente.service';
6	import { Observable } from 'rxjs';	6	import { Observable } from 'rxjs';
7		7
8	@Injectable()	8	@Injectable()
9	export class ArticuloService {	9	export class ArticuloService {
10	carrito: IArticulo[] = [];	10	carrito: IArticulo[] = [];
11	articuloAcargar: IArticulo;	11	articuloAcargar: IArticulo;
12	promoAcargar: IArticulo;	12	promoAcargar: IArticulo;
13	mostrar: string;	13	mostrar: string;
14	esPromoPersonalizada = false;	14	esPromoPersonalizada = false;
15	urlDeboSuite = APP_SETTINGS.apiDeboSuite;	15	urlDeboSuite = APP_SETTINGS.apiDeboSuite;
16	medioPago: number;	16	medioPago: number;
17	idComanda: number;	17	idComanda: number;
18	subTotal = 0;	18	subTotal = 0;
19		19
20	constructor(	20	constructor(
21	private http: HttpClient,	21	private http: HttpClient,
22	private clienteService: ClienteService,	22	private clienteService: ClienteService,
23	) { }	23	) { }
24		24
25	getById(id) {	25	getById(id) {
26	return this.http.get(`${this.urlDeboSuite}/articulos/${id}`);	26	return this.http.get(`${this.urlDeboSuite}/articulos/${id}`);
27	}	27	}
28		28
29	getAll() {	29	getAll() {
30	return this.http.get(`${this.urlDeboSuite}/articulos/`);	30	return this.http.get(`${this.urlDeboSuite}/articulos/`);
31	}	31	}
32		32
33	getAllWithPaginator(page: number = 1) {	33	getAllWithPaginator(page: number = 1) {
34	return this.http.get(`${this.urlDeboSuite}/articulos/${page}`);	34	return this.http.get(`${this.urlDeboSuite}/articulos/${page}`);
35	}	35	}
36		36
37	calcularTotal() {	37	calcularTotal() {
38	this.subTotal = 0;	38	this.subTotal = 0;
39	this.carrito.forEach(articulo => {	39	this.carrito.forEach(articulo => {
40	this.subTotal += (articulo.PreVen * articulo.cantidad);	40	this.subTotal += (articulo.PreVen * articulo.cantidad);
41	});	41	});
42	}	42	}
43		43
44	setArticulo(articulo: IArticulo) {	44	setArticulo(articulo: IArticulo) {
45	articulo.cantidad = 1;	45	articulo.cantidad = 1;
46	for (const articuloCarrito of this.carrito) {	46	for (const articuloCarrito of this.carrito) {
47	if (articuloCarrito.id === articulo.id) {	47	if (articuloCarrito.id === articulo.id && !articulo.productos.length) {
48	articuloCarrito.cantidad++;	48	articuloCarrito.cantidad++;
49	this.calcularTotal();	49	this.calcularTotal();
50	return;	50	return;
51	}	51	}
52	}	52	}
53	this.setArticulosSinImagen([articulo]);	53	this.setArticulosSinImagen([articulo]);
54	this.carrito.unshift(articulo);	54	this.carrito.unshift(articulo);
55	this.calcularTotal();	55	this.calcularTotal();
56	}	56	}
57		57
58	deleteArticulo(index: number) {	58	deleteArticulo(index: number) {
59	this.carrito.splice(index, 1);	59	this.carrito.splice(index, 1);
60	this.calcularTotal();	60	this.calcularTotal();
61	}	61	}
62		62
63	pay(dataPago: any) {	63	pay(dataPago: any) {
64	return new Observable((observer) => {	64	return new Observable((observer) => {
65	this.clienteService.getById(-1)	65	this.clienteService.getById(-1)
66	.subscribe(cliente => {	66	.subscribe(cliente => {
67	this.markArticuloInPromoAsRemoved();	67	this.markArticuloInPromoAsRemoved();
68	this.http.post(`${this.urlDeboSuite}/comprobante/guardar/${this.medioPago}`, {	68	this.http.post(`${this.urlDeboSuite}/comprobante/guardar/${this.medioPago}`, {
69	productos: this.carrito,	69	productos: this.carrito,
70	cliente,	70	cliente,
71	origen: 'autoservicio',	71	origen: 'autoservicio',
72	codigoVendedor: 5,	72	codigoVendedor: 5,
73	puntoVenta: APP_SETTINGS.puntoVenta,	73	puntoVenta: APP_SETTINGS.puntoVenta,
74	pedidoAnombreDe: dataPago.pedidoAnombreDe,	74	pedidoAnombreDe: dataPago.pedidoAnombreDe,
75	numeroPlanilla: APP_SETTINGS.numeroPlanilla,	75	numeroPlanilla: APP_SETTINGS.numeroPlanilla,
76	})	76	})
77	.subscribe((data) => {	77	.subscribe((data) => {
78	observer.next(data);	78	observer.next(data);
79	observer.complete();	79	observer.complete();
80	});	80	});
81	});	81	});
82	});	82	});
83	}	83	}
84		84
85	cleanShoppingCar() {	85	cleanShoppingCar() {
86	this.articuloAcargar = undefined;	86	this.articuloAcargar = undefined;
87	this.promoAcargar = undefined;	87	this.promoAcargar = undefined;
88	this.carrito = [];	88	this.carrito = [];
89	}	89	}
90		90
91	setArticulosSinImagen(articulos: IArticulo[]) {	91	setArticulosSinImagen(articulos: IArticulo[]) {
92	articulos.forEach((articulo: IArticulo) => {	92	articulos.forEach((articulo: IArticulo) => {
93	articulo.imagenes = !articulo.imagenes ? [{ imagen: 'noImage.jpg' }] :	93	articulo.imagenes = !articulo.imagenes ? [{ imagen: 'noImage.jpg' }] :
94	!articulo.imagenes.length ? [{ imagen: 'noImage.jpg' }] : articulo.imagenes;	94	!articulo.imagenes.length ? [{ imagen: 'noImage.jpg' }] : articulo.imagenes;
95	});	95	});
96	}	96	}
97		97
98	markArticuloInPromoAsRemoved() {	98	markArticuloInPromoAsRemoved() {
99	this.carrito.forEach((articuloCarrito: IArticulo) => {	99	this.carrito.forEach((articuloCarrito: IArticulo) => {
100	if (articuloCarrito.PRO) {	100	if (articuloCarrito.PRO) {
101	articuloCarrito.productos.forEach((articulo: IArticulo) => {	101	articuloCarrito.productos.forEach((articulo: IArticulo) => {
102	if (articulo.cantidadAdicionada === 0) {	102	if (articulo.cantidadAdicionada === 0) {
103	articulo.cantidad = 0;	103	articulo.cantidad = 0;
104	articulo.importeValorExtra = 0;	104	articulo.importeValorExtra = 0;
105	}	105	}
106	});	106	});
107	}	107	}
108	});	108	});
109	}	109	}
110	}	110	}
111		111

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

Diff comments View file @ 5ecbcd7

 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 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);
+          this.openModalSinonimos(res, promo);
         } else {
           promo.cantidad = 1;
           this.articuloService.setArticulo(promo);
           this.modalPromocion.hide();
         }
       }, err => console.error(err));
     this.mediaPantalla();
   }
-  openModalSinonimos(sinonimosData: ISinonimo[]) {
+  openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
     const modalSinonimo = this.modalService.show(SinonimoComponent, {
       initialState: { sinonimos: sinonimosData },
       class: 'modal-promo modal-dialog-centered'
     });
     modalSinonimo.content.onClose
-      .subscribe((articulo: IArticulo) => {
+      .subscribe((res: any) => {
+        for (const a of articulo.productos) {
+          if (a.idSinonimo === res.ID_SIN) {
+            a.CODA = res.articulo.CodArt;
+            a.CodArt = res.articulo.CodArt;
+            a.SECA = res.articulo.CodSec;
+            a.CodSec = res.articulo.CodSec;
+            a.PreVen = res.articulo.PreVen;
+            a.id = res.articulo.id;
+            a.DET_LAR = res.articulo.DET_LAR;
+            a.DetArt = res.articulo.DetArt;
+          }
+        }
         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();
   }
   @HostListener('scroll', ['$event'])
   scrollEvent(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.ts

Diff comments View file @ 5ecbcd7

 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(
     private modalRef: BsModalRef,
     private articuloService: ArticuloService,
   ) {
     this.onClose = new Subject();
   }
   ngOnInit() {
   }
   selectArticulo(articulo: IArticulo) {
     for (const s of this.sinonimos) {
       for (const a of s.productos) {
         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() {
+    if (!this.isValid) return;
+    const ID_SIN = this.articuloSelected.ID_SIN;
     this.articuloService.getById(this.articuloSelected.id)
       .subscribe((res: IArticulo) => {
         this.modalRef.hide();
-        this.onClose.next(res);
+        this.onClose.next({
-      });
+          articulo: res,
+          ID_SIN
+        });
+      }, err => console.error(err));
   }
 }