Marcelo Puebla / autoservicio-axion

Commit a741af2953a290daea9ab893d6aa008ff9ed50fd

Authored by Marcelo Puebla 2020-03-04 11:02:14 -0300

2 parents c8b1956700 fb598a4469

Exists in develop

Merge branch 'develop' into 'develop'

Develop

See merge request !159

Showing 12 changed files Show diff stats

src/app/interfaces/IArticulo.ts

Diff comments View file @ a741af2

1	export interface IArticulo {	1	export interface IArticulo {
2	cantidad?: number;	2	cantidad?: number;
3	cantidadAdicionada?: number;	3	cantidadAdicionada?: number;
4	cantidadVendida?: number;	4	cantidadVendida?: number;
5	categoria_selfservice?: number;	5	categoria_selfservice?: number;
6	CodArt: number;	6	CodArt: number;
7	codigoBarra?: ICodigoBarra[];	7	codigoBarra?: ICodigoBarra[];
8	CodSec: number;	8	CodSec: number;
9	DetArt: string;	9	DetArt: string;
10	DET_LAR: string;	10	DET_LAR: string;
11	ELBPRO: string;	11	ELBPRO: string;
12	esAdicionable?: boolean;	12	esAdicionable?: boolean;
13	esSustraible?: boolean;	13	esSustraible?: boolean;
14	FPP?: boolean;	14	FPP?: boolean;
15	id: number;	15	id: number;
16	idSinonimo?: number;	16	idSinonimo?: number;
17	ID_SIN?: number;	17	ID_SIN?: number;
18	imagenes?: any[];	18	imagenes?: any[];
19	ImpInt: number;	19	ImpInt: number;
20	ImpInt2: number;	20	ImpInt2: number;
21	ImpInt3: number;	21	ImpInt3: number;
22	importeValorExtra?: number;	22	importeValorExtra?: number;
23	PreVen: number;	23	PreVen: number;
24	PRO: boolean;	24	PRO: boolean;
25	productos?: IArticulo[];	25	productos?: IArticulo[];
26	seleccionado?: boolean;	26	seleccionado?: boolean;
27	tieneSinonimo?: boolean;	27	tieneSinonimo?: boolean;
28	tipo_articulo?: number;	28	tipo_articulo?: number;
29	CODA?: number;	29	CODA?: number;
30	CODP?: number;	30	CODP?: number;
31	SECA?: number;	31	SECA?: number;
32	SECP?: number;	32	SECP?: number;
33	MKT_DESC?: string;	33	MKT_DESC?: string;
34	NHA?: boolean;	34	NHA?: boolean;
35	FECHA_VIGENCIA_HASTA?: Date;	35	FECHA_VIGENCIA_HASTA?: Date;
36	FECHA_VIGENCIA_DESDE?: Date;	36	FECHA_VIGENCIA_DESDE?: Date;
37	ExiVta?: number;	37	ExiVta?: number;
38	ORDEN_P? : number;	38	ORDEN_P?: number;
39	}	39	}
40		40
41	export interface ICodigoBarra {	41	export interface ICodigoBarra {
42	CodBar: string;	42	CodBar: string;
43	CodArt: number;	43	CodArt: number;
44	CodSec: string;	44	CodSec: string;
45	}	45	}
46		46

src/app/modules/carrito/carrito.component.html

Diff comments View file @ a741af2

1	<div class="h-92 bg-white fade-in-left">	1	<div class="h-92 bg-white fade-in-left">
2	<!-- PUBLICIDADES -->	2	<!-- PUBLICIDADES -->
3	<app-header-publicidad></app-header-publicidad>	3	<app-header-publicidad></app-header-publicidad>
4		4
5	<div class="h-75 carrito-content" #carritoContent>	5	<div class="h-75 carrito-content" #carritoContent>
6	<!-- CABECERA -->	6	<!-- CABECERA -->
7	<div class="row mx-3 h-auto border border-primary rounded-sm">	7	<div class="row mx-3 h-auto border border-primary rounded-sm">
8	<div class="col-12 px-0 py-2 align-self-center">	8	<div class="col-12 px-0 py-2 align-self-center">
9	<div class="px-3">	9	<div class="px-3">
10	<p class="h6 text-truncate">ESTE ES TÚ CARRITO DE COMPRAS</p>	10	<p class="h6 text-truncate">ESTE ES TÚ CARRITO DE COMPRAS</p>
11	</div>	11	</div>
12	</div>	12	</div>
13	</div>	13	</div>
14		14
15	<!-- CARRITO -->	15	<!-- CARRITO -->
16	<div	16	<div
17	class="row mx-2 mt-4 h-80 h-lg-60 align-content-start scroll-y-visible"	17	class="row mx-2 mt-4 h-80 h-lg-60 align-content-start scroll-y-visible"
18	(scroll)="scrollEvent($event)">	18	(scroll)="scrollEvent($event)">
19	<!-- MENSAJE DE ADVERTENCIA -->	19	<!-- MENSAJE DE ADVERTENCIA -->
20	<div class="col-10 align-self-center alert alert-primary" *ngIf="!articuloService.carrito.length">	20	<div class="col-10 align-self-center alert alert-primary" *ngIf="!articuloService.carrito.length">
21	<p class="h5 text-center">No hay artículos en el carrito</p>	21	<p class="h5 text-center">No hay artículos en el carrito</p>
22	</div>	22	</div>
23	<!-- ARTICULOS -->	23	<!-- ARTICULOS -->
24	<div	24	<div
25	class="col-12 col-xl-6 p-2 h-50 h-md-25 h-xl-40 text-center text-truncate carrito-articulo"	25	class="col-12 col-xl-6 p-2 h-50 h-md-25 h-xl-40 text-center text-truncate carrito-articulo"
26	[ngClass]="{'media-pantalla': carritoContent.classList.contains('media-pantalla')}"	26	[ngClass]="{'media-pantalla': carritoContent.classList.contains('media-pantalla')}"
27	*ngFor="let articulo of articuloService.carrito; let i = index;"	27	*ngFor="let articulo of articuloService.carrito; let i = index;"
28	@EnterLeaveX>	28	@EnterLeaveX>
29	<!-- ARTICULO -->	29	<!-- ARTICULO -->
30	<div class="h-100 border border-primary rounded-sm">	30	<div class="h-100 border border-primary rounded-sm">
31	<div class="row align-items-center mx-0 h-100">	31	<div class="row align-items-center mx-0 h-100">
32	<!-- NOMBRE E IMAGEN -->	32	<!-- NOMBRE E IMAGEN -->
33	<div class="col-6 col-md-3 h-50 h-md-100 border-right border-primary">	33	<div class="col-6 col-md-3 h-50 h-md-100 border-right border-primary">
34	<img	34	<img
35	draggable="false"	35	draggable="false"
36	ondragstart="return false;"	36	ondragstart="return false;"
37	(contextmenu)="false"	37	(contextmenu)="false"
38	class="d-none d-md-block mx-auto h-55 rounded-sm shadow-sm"	38	class="d-none d-md-block mx-auto h-55 rounded-sm shadow-sm"
39	src="{{urlImagenes}}{{articulo.imagenes[0].imagen}}"	39	src="{{urlImagenes}}{{articulo.imagenes[0].imagen}}"
40	onerror="this.src='assets/img/imagen-no-encontrada.jpg'">	40	onerror="this.src='assets/img/imagen-no-encontrada.jpg'">
41	<div class="row mx-0 h-100 h-md-45">	41	<div class="row mx-0 h-100 h-md-45">
42	<p class="col px-0 text-primary carrito-text-desc align-self-center">	42	<p class="col px-0 text-primary carrito-text-desc align-self-center">
43	<small>{{articulo.MKT_DESC ? articulo.MKT_DESC.toUpperCase() : articulo.DetArt.toUpperCase()}}</small>	43	<small>{{articulo.MKT_DESC ? articulo.MKT_DESC.toUpperCase() : articulo.DetArt.toUpperCase()}}</small>
44	</p>	44	</p>
45	</div>	45	</div>
46	</div>	46	</div>
47	<!-- CANTIDAD -->	47	<!-- CANTIDAD -->
48	<div class="col-6 col-md-3 h-50 h-md-100 border-right border-primary">	48	<div class="col-6 col-md-3 h-50 h-md-100 border-right border-primary">
49	<p class="h-40"><small>CANT</small></p>	49	<p class="h-40"><small>CANT</small></p>
50	<app-articulo-cantidad [articulo]="articulo"></app-articulo-cantidad>	50	<app-articulo-cantidad [articulo]="articulo"></app-articulo-cantidad>
51	</div>	51	</div>
52	<!-- PRECIO -->	52	<!-- PRECIO -->
53	<div class="col-6 col-md-3 h-50 h-md-100 border-right border-primary">	53	<div class="col-6 col-md-3 h-50 h-md-100 border-right border-primary">
54	<p class="h-40"><small>PRECIO</small></p>	54	<p class="h-40"><small>PRECIO</small></p>
55	<div class="py-1 badge-pill bg-dark text-white">	55	<div class="py-1 badge-pill bg-dark text-white">
56	<p><small>{{articulo.PreVen \| currency}}</small></p>	56	<p><small>{{articulo.PreVen \| currency}}</small></p>
57	</div>	57	</div>
58	</div>	58	</div>
59	<!-- ELIMINAR -->	59	<!-- ELIMINAR -->
60	<div class="col-6 col-md-3 align-self-center">	60	<div class="col-6 col-md-3 align-self-center">
61	<div class="row mx-0 justify-content-center">	61	<div class="row mx-0 justify-content-center">
62	<div	62	<div
63	class="col-auto px-3 py-1 btn-effect bg-primary badge-pill text-white"	63	class="col-auto px-3 py-1 btn-effect bg-primary badge-pill text-white"
64	(click)="deleteArticulo(i)">	64	(click)="deleteArticulo(i)">
65	<span>	65	<span>
66	<small class="pr-2">ELIMINAR</small>	66	<small class="pr-2">ELIMINAR</small>
67	<img	67	<img
68	draggable="false"	68	draggable="false"
69	ondragstart="return false;"	69	ondragstart="return false;"
70	(contextmenu)="false"	70	(contextmenu)="false"
71	class="icon-20 rotate-45"	71	class="icon-20 rotate-45"
72	src="assets/img/mas-blanco.svg">	72	src="assets/img/mas-blanco.svg">
73	</span>	73	</span>
74	</div>	74	</div>
75	</div>	75	</div>
76	</div>	76	</div>
77	</div>	77	</div>
78	</div>	78	</div>
79	</div>	79	</div>
80	</div>	80	</div>
81	<!-- TOTAL -->	81	<!-- TOTAL -->
82	<div class="row mx-3 mt-2 h-auto justify-content-end">	82	<div class="row mx-3 mt-2 h-auto justify-content-end">
83	<div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>	83	<div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
84	<div class="col-auto align-self-center bg-primary badge-pill">	84	<div class="col-auto align-self-center bg-primary badge-pill">
85	<p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.total \| currency}}</p>	85	<p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.total \| currency}}</p>
86	</div>	86	</div>
87	</div>	87	</div>
88	<!-- CONTINUAR -->	88	<!-- CONTINUAR -->
89	<div	89	<div
90	*ngIf="articuloService.carrito.length"	90	*ngIf="articuloService.carrito.length"
91	class="row mx-3 mt-4 h-auto justify-content-end">	91	class="row mx-3 mt-4 h-auto justify-content-end">
92	<div	92	<div
93	class="col-auto py-2 px-3 align-self-center btn-effect bg-primary badge-pill text-white"	93	class="col-auto py-2 px-3 align-self-center btn-effect bg-primary badge-pill text-white"
94	[routerLink]="['/forma-pago']">	94	(click)="validateCarrito()">
95	<span>	95	<span>
96	<small class="pr-2">CONTINUAR</small>	96	<small class="pr-2">CONTINUAR</small>
97	<img	97	<img
98	draggable="false"	98	draggable="false"
99	ondragstart="return false;"	99	ondragstart="return false;"
100	(contextmenu)="false"	100	(contextmenu)="false"
101	class="icon-20"	101	class="icon-20"
102	src="assets/img/ir.svg">	102	src="assets/img/ir.svg">
103	</span>	103	</span>
104	</div>	104	</div>
105	</div>	105	</div>
106	</div>	106	</div>
107		107
108	</div>	108	</div>
109		109

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

Diff comments View file @ a741af2

 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 { Router } from '@angular/router';
-import { BsModalRef } from 'ngx-bootstrap/modal/public_api';
+import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
 import { ANIMATIONS } from 'src/app/utils/animations';
+import { ErrorFormaPagoComponent } from 'src/app/shared/error-forma-pago/error-forma-pago.component';
+import { ErrorStockComponent } from 'src/app/shared/error-stock/error-stock.component';
 @Component({
   selector: 'app-carrito',
   templateUrl: './carrito.component.html',
   styleUrls: ['./carrito.component.scss'],
   animations: [ANIMATIONS.EnterLeaveX]
 })
 export class CarritoComponent implements OnInit, OnDestroy {
   urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
   maxCantidad = 50;
   modalRef: BsModalRef;
   constructor(
     public articuloService: ArticuloService,
     private location: Location,
     private router: Router,
     private inactiveScreen: InactiveScreenService,
+    private modalService: BsModalService
   ) { }
   ngOnInit() {
     if (!this.articuloService.carrito.length) {
       this.router.navigate(['']);
       return;
     }
     this.mediaPantalla();
   }
   ngOnDestroy() {
     if (this.modalRef) this.modalRef.hide();
   }
   deleteArticulo(index: number) {
     this.articuloService.deleteArticulo(index);
   }
+  validateCarrito() {
+    const res = this.articuloService.validateCarrito()
+    if (res.valid) {
+      this.router.navigate(['forma-pago']);
+    } else {
+      this.modalService.show(
+        ErrorStockComponent,
+        {
+          initialState: { articulo: res.articulo },
+          class: 'modal-dialog-centered'
+        });
+    }
+  }
   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();
   }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $(`.carrito-content`).addClass('media-pantalla').addBack('media-pantalla');
     }
   }
 }

src/app/modules/carrito/carrito.module.ts

Diff comments View file @ a741af2

 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CarritoRoutingModule } from './carrito-routing.module';
 import { CarritoComponent } from './carrito.component';
 import { SeleccionArticulosModule } from '../seleccion-articulos/seleccion-articulos.module';
 import { SharedModule } from '../shared/shared.module';
+import { ErrorStockComponent } from 'src/app/shared/error-stock/error-stock.component';
 @NgModule({
-  declarations: [CarritoComponent],
+  declarations: [
+    CarritoComponent,
+    ErrorStockComponent
+  ],
   imports: [
     CommonModule,
     CarritoRoutingModule,
     SeleccionArticulosModule,
     SharedModule,
-  ]
+  ],
+  entryComponents: [ErrorStockComponent]
 })
 export class CarritoModule { }

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

Diff comments View file @ a741af2

1	import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit } from '@angular/core';	1	import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit } from '@angular/core';
2	import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';	2	import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
3	import { ArticuloService } from 'src/app/services/articulo/articulo.service';	3	import { ArticuloService } from 'src/app/services/articulo/articulo.service';
4	import { IArticulo } from 'src/app/interfaces/IArticulo';	4	import { IArticulo } from 'src/app/interfaces/IArticulo';
5	import { APP_SETTINGS } from 'src/etc/AppSettings';	5	import { APP_SETTINGS } from 'src/etc/AppSettings';
6	import { ICategoria } from 'src/app/interfaces/ICategoria';	6	import { ICategoria } from 'src/app/interfaces/ICategoria';
7	import { ISinonimo } from 'src/app/interfaces/ISinonimo';	7	import { ISinonimo } from 'src/app/interfaces/ISinonimo';
8	import { PromocionComponent } from 'src/app/shared/promocion/promocion.component';	8	import { PromocionComponent } from 'src/app/shared/promocion/promocion.component';
9	import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';	9	import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
10	import { SinonimoService } from 'src/app/services/sinonimo/sinonimo.service';	10	import { SinonimoService } from 'src/app/services/sinonimo/sinonimo.service';
11	import { SinonimoComponent } from 'src/app/shared/sinonimo/sinonimo.component';	11	import { SinonimoComponent } from 'src/app/shared/sinonimo/sinonimo.component';
12	import { FiltroCategoriasComponent } from './filtro-categorias/filtro-categorias.component';	12	import { FiltroCategoriasComponent } from './filtro-categorias/filtro-categorias.component';
13	import * as _ from 'lodash';	13	import * as _ from 'lodash';
14	import { ANIMATIONS } from 'src/app/utils/animations';	14	import { ANIMATIONS } from 'src/app/utils/animations';
15	import { NoStockComponent } from './no-stock/no-stock.component';	15	import { NoStockComponent } from './no-stock/no-stock.component';
16	import { DateExtension } from 'src/app/utils/dateExtension';	16	import { DateExtension } from 'src/app/utils/dateExtension';
17		17
18	@Component({	18	@Component({
19	selector: 'app-seleccion-articulos',	19	selector: 'app-seleccion-articulos',
20	templateUrl: './seleccion-articulos.component.html',	20	templateUrl: './seleccion-articulos.component.html',
21	styleUrls: ['./seleccion-articulos.component.scss'],	21	styleUrls: ['./seleccion-articulos.component.scss'],
22	animations: [ANIMATIONS.EnterLeaveY]	22	animations: [ANIMATIONS.EnterLeaveY]
23	})	23	})
24	export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDestroy {	24	export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDestroy {
25	loading = true;	25	loading = true;
26	timeoutHandler: any;	26	timeoutHandler: any;
27	urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;	27	urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
28	articulos: IArticulo[] = [];	28	articulos: IArticulo[] = [];
29	auxArticulos: IArticulo[] = [];	29	auxArticulos: IArticulo[] = [];
30	showQuantity = 100;	30	showQuantity = 100;
31	searchTerm = '';	31	searchTerm = '';
32	ordenandoByVendidos = true;	32	ordenandoByVendidos = true;
33	modalRef: BsModalRef;	33	modalRef: BsModalRef;
34	total = 0;	34	total = 0;
35	@ViewChild(FiltroCategoriasComponent, { static: false }) filtroCategorias: FiltroCategoriasComponent;	35	@ViewChild(FiltroCategoriasComponent, { static: false }) filtroCategorias: FiltroCategoriasComponent;
36		36
37	constructor(	37	constructor(
38	public articuloService: ArticuloService,	38	public articuloService: ArticuloService,
39	private sinonimoService: SinonimoService,	39	private sinonimoService: SinonimoService,
40	private modalService: BsModalService,	40	private modalService: BsModalService,
41	private inactiveScreen: InactiveScreenService,	41	private inactiveScreen: InactiveScreenService,
42	) { }	42	) { }
43		43
44	ngOnInit() { }	44	ngOnInit() { }
45		45
46	ngAfterViewInit(): void {	46	ngAfterViewInit(): void {
47	this.filtroCategorias.getCategorias();	47	this.filtroCategorias.getCategorias();
48	this.mediaPantalla();	48	this.mediaPantalla();
49	}	49	}
50		50
51	ngOnDestroy() {	51	ngOnDestroy() {
52	for (let i = 1; i <= this.modalService.getModalsCount(); i++) {	52	for (let i = 1; i <= this.modalService.getModalsCount(); i++) {
53	this.modalService.hide(i);	53	this.modalService.hide(i);
54	}	54	}
55	}	55	}
56		56
57	getProductos() {	57	getProductos() {
58	this.articuloService.getAll()	58	this.articuloService.getAll()
59	.subscribe((result: IArticulo[]) => {	59	.subscribe((result: IArticulo[]) => {
60	this.articuloService.setArticulosSinImagen(result);	60	this.articuloService.setArticulosSinImagen(result);
61	if (this.filtroCategorias.queMostrar === 'ordenar') {	61	if (this.filtroCategorias.queMostrar === 'ordenar') {
62	this.filtroCategorias.categorias.forEach((categoria: ICategoria) => {	62	this.filtroCategorias.categorias.forEach((categoria: ICategoria) => {
63	const tempArticulos = result.filter((articulo: IArticulo) => {	63	const tempArticulos = result.filter((articulo: IArticulo) => {
64	return articulo.categoria_selfservice === categoria.id;	64	return articulo.categoria_selfservice === categoria.id;
65	});	65	});
66	result = tempArticulos;	66	result = tempArticulos;
67	});	67	});
68	}	68	}
69	localStorage.setItem('articulos', JSON.stringify(result));	69	localStorage.setItem('articulos', JSON.stringify(result));
70	this.setProductos();	70	this.setProductos();
71	}, (error) => {	71	}, (error) => {
72	console.error(error);	72	console.error(error);
73	});	73	});
74	}	74	}
75		75
76	setProductos() {	76	setProductos() {
77	this.articulos = JSON.parse(localStorage.getItem('articulos'));	77	this.articulos = JSON.parse(localStorage.getItem('articulos'));
78	this.filterItems();	78	this.filterItems();
79	this.loading = false;	79	this.loading = false;
80	}	80	}
81		81
82	filterItems() {	82	filterItems() {
83	if (this.filtroCategorias.categoriaActive === 0) {	83	if (this.filtroCategorias.categoriaActive === 0) {
84	this.auxArticulos = this.articulos;	84	this.auxArticulos = this.articulos;
85	return;	85	return;
86	}	86	}
87	this.auxArticulos = this.articulos.filter(x => {	87	this.auxArticulos = this.articulos.filter(x => {
88	return x.categoria_selfservice === this.filtroCategorias.categoriaActive;	88	return x.categoria_selfservice === this.filtroCategorias.categoriaActive;
89	});	89	});
90	this.ordenar();	90	this.ordenar();
91	}	91	}
92		92
93	ordenar() {	93	ordenar() {
94	if (this.ordenandoByVendidos) {	94	if (this.ordenandoByVendidos) {
95	this.auxArticulos.sort((a, b) => {	95	this.auxArticulos.sort((a, b) => {
96	return b.cantidadVendida - a.cantidadVendida;	96	return b.cantidadVendida - a.cantidadVendida;
97	});	97	});
98	}	98	}
99	}	99	}
100		100
101	selectArticulo(articulo: IArticulo) {	101	selectArticulo(articulo: IArticulo) {
102	if (articulo.ExiVta < 1) {	102	if (articulo.ExiVta < 1) {
103	if (this.modalRef) return;	103	if (this.modalRef) return;
104	this.modalRef = this.modalService.show(NoStockComponent, {	104	this.modalRef = this.modalService.show(NoStockComponent, {
105	class: 'modal-dialog-centered',	105	class: 'modal-dialog-centered',
106	backdrop: false,	106	backdrop: false,
107	ignoreBackdropClick: true,	107	ignoreBackdropClick: true,
108	});	108	});
109	this.modalRef.content.onClose	109	this.modalRef.content.onClose
110	.subscribe(() => this.modalRef = null);	110	.subscribe(() => this.modalRef = null);
111	} else {	111	} else {
112	this.getByID(articulo.id);	112	this.getByID(articulo.id);
113	}	113	}
114	}	114	}
115		115
116	getByID(id: number) {	116	getByID(id: number) {
117	this.articuloService.getById(id)	117	this.articuloService.getById(id)
118	.subscribe((res: IArticulo) => {	118	.subscribe((res: IArticulo) => {
119	if (res.FPP) {	119	if (res.FPP) {
120	this.openModalPromos(res);	120	this.openModalPromos(res);
121	} else {	121	} else {
122	this.getSinonimos(res);	122	this.getSinonimos(res);
123	}	123	}
124	}, err => console.error(err));	124	}, err => console.error(err));
125	}	125	}
126		126
127	getSinonimos(articulo: IArticulo) {	127	getSinonimos(articulo: IArticulo) {
128	this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt)	128	this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt)
129	.subscribe((res: any[]) => {	129	.subscribe((res: any[]) => {
130	if (res.length) {	130	if (res.length) {
131	const sinonimos = [];	131	const sinonimos = [];
132	const gruposArticulos = _.groupBy(res[0].productos, 'ORDEN_P');	132	const gruposArticulos = _.groupBy(res[0].productos, 'ORDEN_P');
133	Object.keys(gruposArticulos).forEach(key => {	133	Object.keys(gruposArticulos).forEach(key => {
134	sinonimos.push({ productos: gruposArticulos[key], });	134	sinonimos.push({ productos: gruposArticulos[key], });
135	});	135	});
136	for (let j = 0; j < articulo.productos.length; j++) {	136	for (const a of articulo.productos) {
137	Object.keys(gruposArticulos).forEach((key, i) => {	137	Object.keys(gruposArticulos).forEach((key, i) => {
138	if (gruposArticulos[key][i].ID_SIN.toString() === articulo.productos[j].idSinonimo.toString()) {	138	if (gruposArticulos[key][i].ID_SIN.toString() === a.idSinonimo.toString()) {
139	sinonimos[i].cantidad = sinonimos[i].cantidadRestante = articulo.productos[j].cantidad;	139	sinonimos[i].cantidad = sinonimos[i].cantidadRestante = a.cantidad;
140	}	140	}
141	});	141	});
142	}	142	}
143	res = sinonimos;	143	res = sinonimos;
144	this.openModalSinonimos(res, articulo);	144	this.openModalSinonimos(res, articulo);
145	} else {	145	} else {
146	this.articuloService.setArticulo(articulo);	146	this.articuloService.setArticulo(articulo);
147	}	147	}
148	});	148	});
149	}	149	}
150		150
151	openModalPromos(articulo: IArticulo) {	151	openModalPromos(articulo: IArticulo) {
152	if (this.modalRef) return;	152	if (this.modalRef) return;
153	this.articuloService.setArticulosSinImagen([articulo]);	153	this.articuloService.setArticulosSinImagen([articulo]);
154	this.modalRef = this.modalService.show(PromocionComponent, {	154	this.modalRef = this.modalService.show(PromocionComponent, {
155	initialState: { articulosPromo: [articulo] },	155	initialState: { articulosPromo: [articulo] },
156	class: 'modal-dialog-centered',	156	class: 'modal-dialog-centered',
157	ignoreBackdropClick: true,	157	ignoreBackdropClick: true,
158	});	158	});
159	this.modalRef.content.onClose	159	this.modalRef.content.onClose
160	.subscribe(() => this.modalRef = null);	160	.subscribe(() => this.modalRef = null);
161	this.mediaPantalla();	161	this.mediaPantalla();
162	}	162	}
163		163
164	openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {	164	openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
165	if (this.modalRef) return;	165	if (this.modalRef) return;
166	this.modalRef = this.modalService.show(SinonimoComponent, {	166	this.modalRef = this.modalService.show(SinonimoComponent, {
167	initialState: {	167	initialState: {
168	sinonimos: sinonimosData,	168	sinonimos: sinonimosData,
169	articulo	169	articulo
170	},	170	},
171	class: 'modal-dialog-centered',	171	class: 'modal-dialog-centered',
172	ignoreBackdropClick: true,	172	ignoreBackdropClick: true,
173	});	173	});
174		174
175	this.modalRef.content.onClose	175	this.modalRef.content.onClose
176	.subscribe((res: any) => {	176	.subscribe((res: any) => {
177	this.modalRef = null;	177	this.modalRef = null;
178	if (!res) return;	178	if (!res) return;
179	articulo.productos = res.articulos;	179	articulo.productos = res.articulos;
180	this.articuloService.setArticulo(articulo);	180	this.articuloService.setArticulo(articulo);
181	});	181	});
182	this.mediaPantalla();	182	this.mediaPantalla();
183	}	183	}
184		184
185	deleteArticulo(index: number) {	185	deleteArticulo(index: number) {
186	this.articuloService.deleteArticulo(index);	186	this.articuloService.deleteArticulo(index);
187	}	187	}
188		188
189	increaseShow() {	189	increaseShow() {
190	this.showQuantity += 100;	190	this.showQuantity += 100;
191	}	191	}
192		192
193		193
194	validarFecha(fechaInicio: string, fechaFin: string) {	194	validarFecha(fechaInicio: string, fechaFin: string) {
195	return DateExtension.ValidateDateRange(fechaInicio, fechaFin);	195	return DateExtension.ValidateDateRange(fechaInicio, fechaFin);
196	}	196	}
197		197
198	@HostListener('scroll', ['$event'])	198	@HostListener('scroll', ['$event'])
199	scrollEvent(event: Event) {	199	scrollEvent(event: Event) {
200	clearTimeout(this.inactiveScreen.timerReposo);	200	clearTimeout(this.inactiveScreen.timerReposo);
201	this.inactiveScreen.startTimeOutInactividad();	201	this.inactiveScreen.startTimeOutInactividad();
202	}	202	}
203		203
204	mouseup() {	204	mouseup() {
205	if (!this.timeoutHandler) return;	205	if (!this.timeoutHandler) return;
206	clearInterval(this.timeoutHandler);	206	clearInterval(this.timeoutHandler);
207	}	207	}
208		208
209	scrollY(el: HTMLElement, value) {	209	scrollY(el: HTMLElement, value) {
210	el.scroll({ behavior: 'smooth', top: value + el.scrollTop });	210	el.scroll({ behavior: 'smooth', top: value + el.scrollTop });
211	this.timeoutHandler = setInterval(() => {	211	this.timeoutHandler = setInterval(() => {
212	el.scroll({ behavior: 'smooth', top: value + el.scrollTop });	212	el.scroll({ behavior: 'smooth', top: value + el.scrollTop });
213	}, 500);	213	}, 500);
214	}	214	}
215		215
216	scrollX(el: HTMLElement, value) {	216	scrollX(el: HTMLElement, value) {
217	el.scroll({ behavior: 'smooth', left: value + el.scrollLeft });	217	el.scroll({ behavior: 'smooth', left: value + el.scrollLeft });
218	this.timeoutHandler = setInterval(() => {	218	this.timeoutHandler = setInterval(() => {
219	el.scroll({ behavior: 'smooth', left: value + el.scrollLeft });	219	el.scroll({ behavior: 'smooth', left: value + el.scrollLeft });
220	}, 500);	220	}, 500);
221	}	221	}
222		222
223	mediaPantalla() {	223	mediaPantalla() {
224	if ($('body').hasClass('media-pantalla')) {	224	if ($('body').hasClass('media-pantalla')) {
225	$(`.cat-content,#cat-content,#content,.cat-btn,#boxCarrito,	225	$(`.cat-content,#cat-content,#content,.cat-btn,#boxCarrito,
226	.cat-box,.img-categoria, .modal-content`)	226	.cat-box,.img-categoria, .modal-content`)
227	.addClass('media-pantalla')	227	.addClass('media-pantalla')
228	.addBack('media-pantalla');	228	.addBack('media-pantalla');
229	}	229	}
230	}	230	}
231	}	231	}
232		232

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

Diff comments View file @ a741af2

 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;
   total = 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}`);
   }
   substractCant(articulo: IArticulo) {
     if (articulo.cantidad === 1) return;
     articulo.cantidad--;
     this.calcularTotal();
   }
   addCant(articulo: IArticulo) {
-    if (articulo.cantidad >= articulo.ExiVta) return;
     articulo.cantidad++;
     this.calcularTotal();
   }
   calcularTotal() {
     this.total = 0;
     this.carrito.forEach(articulo => {
       this.total += (articulo.PreVen * articulo.cantidad);
     });
   }
   setArticulo(articulo: IArticulo) {
     articulo.cantidad = 1;
     for (const articuloCarrito of this.carrito) {
-      if (articuloCarrito.id === articulo.id && !articulo.productos) {
+      if (articuloCarrito.id === articulo.id) {
-        articuloCarrito.cantidad++;
+        if (!articuloCarrito.productos) break;
-        this.calcularTotal();
+        let samePromo = false;
+        articuloCarrito.productos.forEach((a, i) => {
+          samePromo = (a.id === articulo.productos[i].id);
+        });
+        if (!samePromo) break;
+        this.addCant(articuloCarrito);
         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,
             pedidoParaLlevar: localStorage.getItem('pedidoParaLlevar'),
             terminal: APP_SETTINGS.terminal,
             contactLess: dataPago.contactLess === 'true' ? true : false,
           })
             .subscribe((data) => {
               observer.next(data);
               observer.complete();
             }, err => {
               observer.error(err);
               observer.complete();
             });
         });
     });
   }
+  validateCarrito() {
+    for (const articulo of this.carrito) {
+      if (articulo.productos) {
+        for (const a of articulo.productos) {
+          if (a.ExiVta - (a.cantidad * articulo.cantidad) < 0) return { valid: false, articulo };
+        }
+      } else if (articulo.ExiVta - articulo.cantidad < 0) return { valid: false, articulo };
+    }
+    return { valid: true };
+  }
   cleanShoppingCar() {
     this.articuloAcargar = undefined;
     this.promoAcargar = undefined;
     this.carrito = [];
     this.calcularTotal();
   }
   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;
           }
         });
       }
     });
   }
   changeArticulo(articuloToChange: IArticulo, articuloData: any) {
     articuloToChange.CODA = articuloData.CodArt;
     articuloToChange.CodArt = articuloData.CodArt;
     articuloToChange.SECA = articuloData.CodSec;
     articuloToChange.CodSec = articuloData.CodSec;
     articuloToChange.PreVen = articuloData.PreVen;
     articuloToChange.id = articuloData.id;
     articuloToChange.DET_LAR = articuloData.DET_LAR;
     articuloToChange.DetArt = articuloData.DetArt;
     articuloToChange.MKT_DESC = articuloData.MKT_DESC;
   }
 }

src/app/shared/error-stock/error-stock.component.html

Diff comments View file @ a741af2

File was created	1	<div class="bg-primary text-center rounded">
	2	<div class="modal-body">
	3	<p class="h4 text-white text-center mx-3 mb-3">El articulo {{articulo.MKT_DESC}} no tiene stock</p>
	4	<div
	5	class="m-0 h4 d-inline-block py-2 btn-effect bg-white badge-pill"
	6	(click)="modalRef.hide()">
	7	Aceptar
	8	</div>
	9	</div>
	10	</div>
	11

src/app/shared/error-stock/error-stock.component.scss

Diff comments View file @ a741af2

src/app/shared/error-stock/error-stock.component.spec.ts

Diff comments View file @ a741af2

File was created	1	import { async, ComponentFixture, TestBed } from '@angular/core/testing';
	2
	3	import { ErrorStockComponent } from './error-stock.component';
	4
	5	describe('ErrorStockComponent', () => {
	6	let component: ErrorStockComponent;
	7	let fixture: ComponentFixture<ErrorStockComponent>;
	8
	9	beforeEach(async(() => {
	10	TestBed.configureTestingModule({
	11	declarations: [ ErrorStockComponent ]
	12	})
	13	.compileComponents();
	14	}));
	15
	16	beforeEach(() => {
	17	fixture = TestBed.createComponent(ErrorStockComponent);
	18	component = fixture.componentInstance;
	19	fixture.detectChanges();
	20	});
	21
	22	it('should create', () => {
	23	expect(component).toBeTruthy();
	24	});
	25	});
	26

src/app/shared/error-stock/error-stock.component.ts

Diff comments View file @ a741af2

File was created	1	import { Component, OnInit } from '@angular/core';
	2	import { BsModalRef } from 'ngx-bootstrap/modal';
	3	import { IArticulo } from 'src/app/interfaces/IArticulo';
	4
	5	@Component({
	6	selector: 'app-error-stock',
	7	templateUrl: './error-stock.component.html',
	8	styleUrls: ['./error-stock.component.scss']
	9	})
	10	export class ErrorStockComponent implements OnInit {
	11	articulo: IArticulo;
	12
	13	constructor(
	14	private modalRef: BsModalRef,
	15	) { }
	16
	17	ngOnInit() { }
	18
	19	}
	20

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

Diff comments View file @ a741af2

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

Diff comments View file @ a741af2

 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';
 import * as _ from 'lodash';
 @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.apiImagenes}/imagenes/`;
   loading = true;
   modalSinonimo: BsModalRef;
   isPromoSelected = false;
   constructor(
     private 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) {
     if (this.isPromoSelected) return;
     this.isPromoSelected = true;
     this.articuloService.getById(promo.id)
       .subscribe((resPromo: IArticulo) => {
         promo = resPromo;
         this.sinonimoService.getSinonimos(promo.CodSec, promo.CodArt)
           .subscribe((res: ISinonimo[]) => {
             if (res.length) {
               const sinonimos = [];
               const gruposArticulos = _.groupBy(res[0].productos, 'ORDEN_P');
               Object.keys(gruposArticulos).forEach(key => {
                 sinonimos.push({ productos: gruposArticulos[key], });
               });
-              for (let j = 0; j < promo.productos.length; j++) {
+              for (const promoProducto of promo.productos) {
                 Object.keys(gruposArticulos).forEach((key, i) => {
-                  if (gruposArticulos[key][i].ID_SIN.toString() === promo.productos[j].idSinonimo.toString()) {
+                  if (gruposArticulos[key][i].ID_SIN.toString() === promoProducto.idSinonimo.toString()) {
-                    sinonimos[i].cantidad = sinonimos[i].cantidadRestante = promo.productos[j].cantidad;
+                    sinonimos[i].cantidad = sinonimos[i].cantidadRestante = promoProducto.cantidad;
                   }
                 });
               }
-              res = sinonimos;
               this.openModalSinonimos(res, promo);
             } else {
               promo.cantidad = 1;
               this.articuloService.setArticulo(promo);
               this.onClose.next();
               this.modalPromocion.hide();
             }
           }, err => console.error(err));
       }, err => console.error(err));
     this.mediaPantalla();
   }
   openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
     if (this.modalSinonimo) return;
     this.modalSinonimo = this.modalService.show(SinonimoComponent, {
       initialState: {
         sinonimos: sinonimosData,
         articulo
       },
       class: 'modal-dialog-centered',
       ignoreBackdropClick: true,
     });
     this.modalSinonimo.content.onClose
       .subscribe((res: any) => {
         this.modalSinonimo = null;
         if (!res) {
           this.onClose.next();
           this.modalPromocion.hide();
           return;
         }
         articulo.productos = res.articulos;
         this.articuloService.setArticulo(articulo);
         this.onClose.next();
         this.modalPromocion.hide();
       });
   }
   getPromociones() {
     const sector = this.articulosPromo[0].CodSec;
     const codigo = this.articulosPromo[0].CodArt;
     this.promocionService.getPromociones(sector, codigo)
       .subscribe((res: IArticulo[]) => {
         res = res.filter(a => a.ExiVta > 0);
         this.loading = false;
         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');
     }
   }
 }

1	import { Component, OnInit, TemplateRef } from '@angular/core';	1	import { Component, OnInit, TemplateRef } from '@angular/core';
2	import { APP_SETTINGS } from 'src/etc/AppSettings';	2	import { APP_SETTINGS } from 'src/etc/AppSettings';
3	import { IPublicidad } from 'src/app/interfaces/IPublicidad';	3	import { IPublicidad } from 'src/app/interfaces/IPublicidad';
4	import { PublicidadService } from 'src/app/services/publicidad/publicidad.service';	4	import { PublicidadService } from 'src/app/services/publicidad/publicidad.service';
5	import { IArticulo } from 'src/app/interfaces/IArticulo';	5	import { IArticulo } from 'src/app/interfaces/IArticulo';
6	import { PromocionComponent } from '../promocion/promocion.component';	6	import { PromocionComponent } from '../promocion/promocion.component';
7	import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';	7	import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
8	import { ArticuloService } from 'src/app/services/articulo/articulo.service';	8	import { ArticuloService } from 'src/app/services/articulo/articulo.service';
9	import { ConfirmacionComponent } from '../confirmacion/confirmacion.component';	9	import { ConfirmacionComponent } from '../confirmacion/confirmacion.component';
10	import { SinonimoService } from 'src/app/services/sinonimo/sinonimo.service';	10	import { SinonimoService } from 'src/app/services/sinonimo/sinonimo.service';
11	import { ISinonimo } from 'src/app/interfaces/ISinonimo';	11	import { ISinonimo } from 'src/app/interfaces/ISinonimo';
12	import { SinonimoComponent } from '../sinonimo/sinonimo.component';	12	import { SinonimoComponent } from '../sinonimo/sinonimo.component';
13	import * as _ from 'lodash';	13	import * as _ from 'lodash';
14	import { NoStockComponent } from 'src/app/modules/seleccion-articulos/no-stock/no-stock.component';	14	import { NoStockComponent } from 'src/app/modules/seleccion-articulos/no-stock/no-stock.component';
15		15
16	@Component({	16	@Component({
17	selector: 'app-header-publicidad',	17	selector: 'app-header-publicidad',
18	templateUrl: './header-publicidad.component.html',	18	templateUrl: './header-publicidad.component.html',
19	styleUrls: ['./header-publicidad.component.scss']	19	styleUrls: ['./header-publicidad.component.scss']
20	})	20	})
21	export class HeaderPublicidadComponent implements OnInit {	21	export class HeaderPublicidadComponent implements OnInit {
22	urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;	22	urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
23	publicidades: IPublicidad[] = [];	23	publicidades: IPublicidad[] = [];
24	modalRef: BsModalRef;	24	modalRef: BsModalRef;
25	modalSinonimo: BsModalRef;	25	modalSinonimo: BsModalRef;
26		26
27	constructor(	27	constructor(
28	private publicidadService: PublicidadService,	28	private publicidadService: PublicidadService,
29	private articuloService: ArticuloService,	29	private articuloService: ArticuloService,
30	private modalService: BsModalService,	30	private modalService: BsModalService,
31	private sinonimoService: SinonimoService	31	private sinonimoService: SinonimoService
32	) { }	32	) { }
33		33
34	ngOnInit() {	34	ngOnInit() {
35	this.getPublicidades();	35	this.getPublicidades();
36	this.mediaPantalla();	36	this.mediaPantalla();
37	}	37	}
38		38
39	getPublicidades() {	39	getPublicidades() {
40	this.publicidadService.getAll()	40	this.publicidadService.getAll()
41	.subscribe((res: IPublicidad[]) => {	41	.subscribe((res: IPublicidad[]) => {
42	this.publicidades = res;	42	this.publicidades = res;
43	}, err => console.error(err));	43	}, err => console.error(err));
44	}	44	}
45		45
46	elegirArticulo(publicidad: IPublicidad) {	46	elegirArticulo(publicidad: IPublicidad) {
47	if (publicidad.id_articulo) this.getByID(publicidad.id_articulo);	47	if (publicidad.id_articulo) this.getByID(publicidad.id_articulo);
48	}	48	}
49		49
50	getByID(id: number) {	50	getByID(id: number) {
51	this.articuloService.getById(id)	51	this.articuloService.getById(id)
52	.subscribe((res: IArticulo) => {	52	.subscribe((res: IArticulo) => {
53	if (res.ExiVta < 1) {	53	if (res.ExiVta < 1) {
54	if (this.modalRef) return;	54	if (this.modalRef) return;
55	this.modalRef = this.modalService.show(NoStockComponent, {	55	this.modalRef = this.modalService.show(NoStockComponent, {
56	class: 'modal-dialog-centered',	56	class: 'modal-dialog-centered',
57	backdrop: false,	57	backdrop: false,
58	ignoreBackdropClick: true,	58	ignoreBackdropClick: true,
59	});	59	});
60	this.modalRef.content.onClose	60	this.modalRef.content.onClose
61	.subscribe(() => this.modalRef = null);	61	.subscribe(() => this.modalRef = null);
62	} else {	62	} else {
63	if (res.FPP) {	63	if (res.FPP) {
64	this.openModalPromos(res);	64	this.openModalPromos(res);
65	return;	65	return;
66	} else {	66	} else {
67	this.openModalConfirmacion(res);	67	this.openModalConfirmacion(res);
68	return;	68	return;
69	}	69	}
70	}	70	}
71	}, err => console.error(err));	71	}, err => console.error(err));
72	}	72	}
73		73
74	openModalPromos(articulo: IArticulo) {	74	openModalPromos(articulo: IArticulo) {
75	if (this.modalRef) return;	75	if (this.modalRef) return;
76	this.modalRef = this.modalService.show(PromocionComponent,	76	this.modalRef = this.modalService.show(PromocionComponent,
77	{	77	{
78	initialState: {	78	initialState: {
79	idArticulo: articulo.id	79	idArticulo: articulo.id
80	},	80	},
81	class: 'modal-dialog-centered'	81	class: 'modal-dialog-centered'
82	});	82	});
83	}	83	}
84		84
85	openModalConfirmacion(articulo: IArticulo) {	85	openModalConfirmacion(articulo: IArticulo) {
86	if (this.modalRef) return;	86	if (this.modalRef) return;
87	this.articuloService.setArticulosSinImagen([articulo]);	87	this.articuloService.setArticulosSinImagen([articulo]);
88	this.modalRef = this.modalService.show(ConfirmacionComponent,	88	this.modalRef = this.modalService.show(ConfirmacionComponent,
89	{	89	{
90	initialState: {	90	initialState: {
91	titleMessage: articulo.DET_LAR,	91	titleMessage: articulo.DET_LAR,
92	imagenPath: articulo.imagenes.length ? articulo.imagenes[0].imagen : 'assets/img/imagen-no-encontrada.jpg',	92	imagenPath: articulo.imagenes.length ? articulo.imagenes[0].imagen : 'assets/img/imagen-no-encontrada.jpg',
93	footerMessageFirst: `¿QUERÉS AGREGAR ESTE COMBO`,	93	footerMessageFirst: `¿QUERÉS AGREGAR ESTE COMBO`,
94	footerMessageSecond: `a tu carrito?`,	94	footerMessageSecond: `a tu carrito?`,
95	footerConfirmation: articulo.PreVen	95	footerConfirmation: articulo.PreVen
96	},	96	},
97	ignoreBackdropClick: true,	97	ignoreBackdropClick: true,
98	class: 'modal-dialog-centered'	98	class: 'modal-dialog-centered'
99	});	99	});
100	this.modalRef.content.onClose.subscribe((resClose) => {	100	this.modalRef.content.onClose.subscribe((resClose) => {
101	this.modalRef = null;	101	this.modalRef = null;
102	if (!resClose) return;	102	if (!resClose) return;
103	this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt)	103	this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt)
104	.subscribe((res: ISinonimo[]) => {	104	.subscribe((res: ISinonimo[]) => {
105	if (res.length) {	105	if (res.length) {
106	const sinonimos = [];	106	const sinonimos = [];
107	const gruposArticulos = _.groupBy(res[0].productos, 'ORDEN_P');	107	const gruposArticulos = _.groupBy(res[0].productos, 'ORDEN_P');
108	Object.keys(gruposArticulos).forEach(key => {	108	Object.keys(gruposArticulos).forEach(key => {
109	sinonimos.push({ productos: gruposArticulos[key], });	109	sinonimos.push({ productos: gruposArticulos[key], });
110	});	110	});
111	for (let j = 0; j < articulo.productos.length; j++) {	111	for (const a of articulo.productos) {
112	Object.keys(gruposArticulos).forEach((key, i) => {	112	Object.keys(gruposArticulos).forEach((key, i) => {
113	if (gruposArticulos[key][i].ID_SIN.toString() === articulo.productos[j].idSinonimo.toString()) {	113	if (gruposArticulos[key][i].ID_SIN.toString() === a.idSinonimo.toString()) {
114	sinonimos[i].cantidad = sinonimos[i].cantidadRestante = articulo.productos[j].cantidad;	114	sinonimos[i].cantidad = sinonimos[i].cantidadRestante = a.cantidad;
115	}	115	}
116	});	116	});
117	}	117	}
118	res = sinonimos;	118	res = sinonimos;
119	this.openModalSinonimos(res, articulo);	119	this.openModalSinonimos(res, articulo);
120	} else {	120	} else {
121	articulo.cantidad = 1;	121	articulo.cantidad = 1;
122	this.articuloService.setArticulo(articulo);	122	this.articuloService.setArticulo(articulo);
123	}	123	}
124	}, err => console.error(err));	124	}, err => console.error(err));
125	});	125	});
126	this.mediaPantalla();	126	this.mediaPantalla();
127	}	127	}
128		128
129	openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {	129	openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
130	if (this.modalSinonimo) return;	130	if (this.modalSinonimo) return;
131	this.modalSinonimo = this.modalService.show(SinonimoComponent, {	131	this.modalSinonimo = this.modalService.show(SinonimoComponent, {
132	initialState: {	132	initialState: {
133	sinonimos: sinonimosData,	133	sinonimos: sinonimosData,
134	articulo	134	articulo
135	},	135	},
136	class: 'modal-dialog-centered'	136	class: 'modal-dialog-centered'
137	});	137	});
138	this.modalSinonimo.content.onClose	138	this.modalSinonimo.content.onClose
139	.subscribe((res: any) => {	139	.subscribe((res: any) => {
140	this.modalSinonimo = null;	140	this.modalSinonimo = null;
141	if (!res) return;	141	if (!res) return;
142	articulo.productos = res.articulos;	142	articulo.productos = res.articulos;
143	this.articuloService.setArticulo(articulo);	143	this.articuloService.setArticulo(articulo);
144	});	144	});
145	}	145	}
146		146
147	mediaPantalla() {	147	mediaPantalla() {
148	if ($('body').hasClass('media-pantalla')) {	148	if ($('body').hasClass('media-pantalla')) {
149	$('#headerPublicidad,#headerPad').addClass('media-pantalla');	149	$('#headerPublicidad,#headerPad').addClass('media-pantalla');
150	}	150	}
151	}	151	}
152	}	152	}
153		153