diff --git a/main.js b/main.js index a9be54a..742b5d4 100644 --- a/main.js +++ b/main.js @@ -9,7 +9,7 @@ function createWindow() { win = new BrowserWindow({ backgroundColor: '#ffffff', autoHideMenuBar: true, - icon: `file://${__dirname}/dist/assets/logo.png` + icon: `file://${__dirname}/dist/autoservicio-axion/favicon.ico` }) win.loadURL(`file://${__dirname}/dist/autoservicio-axion/index.html`) diff --git a/package.json b/package.json index 70bb517..0a577d8 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "e2e": "ng e2e", "electron": "electron .", "electron-build": "ng build --prod --aot=true --build--optimizer=true && electron .", - "build-exe": "electron-packager . --platform=win32 --arch=x64 --asar" + "build-exe": "electron-packager . --platform=win32 --arch=x64" }, "private": true, "dependencies": { diff --git a/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts b/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts index af84e93..5fed2dd 100644 --- a/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts +++ b/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts @@ -138,7 +138,10 @@ export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDes openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) { this.modalRef = this.modalService.show(SinonimoComponent, { - initialState: { sinonimos: sinonimosData }, + initialState: { + sinonimos: sinonimosData, + articulo: articulo + }, class: 'modal-promo modal-dialog-centered' }); diff --git a/src/app/shared/header-publicidad/header-publicidad.component.ts b/src/app/shared/header-publicidad/header-publicidad.component.ts index 38d28df..955445d 100644 --- a/src/app/shared/header-publicidad/header-publicidad.component.ts +++ b/src/app/shared/header-publicidad/header-publicidad.component.ts @@ -83,48 +83,51 @@ export class HeaderPublicidadComponent implements OnInit { }); this.modalRef.content.onClose.subscribe(() => { this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt) - .subscribe((res: ISinonimo[]) => { - if (res.length) { - const sinonimos = []; - const gruposArticulos = _.groupBy(res[0].productos, 'ID_SIN'); - Object.keys(gruposArticulos).forEach(key => { - sinonimos.push({ productos: gruposArticulos[key] }); - }); - res = sinonimos; - this.openModalSinonimos(res, articulo); - } else { - articulo.cantidad = 1; - this.articuloService.setArticulo(articulo); - } - }, err => console.error(err)); + .subscribe((res: ISinonimo[]) => { + if (res.length) { + const sinonimos = []; + const gruposArticulos = _.groupBy(res[0].productos, 'ID_SIN'); + Object.keys(gruposArticulos).forEach(key => { + sinonimos.push({ productos: gruposArticulos[key] }); + }); + res = sinonimos; + this.openModalSinonimos(res, articulo); + } else { + articulo.cantidad = 1; + this.articuloService.setArticulo(articulo); + } + }, err => console.error(err)); }); this.mediaPantalla(); } openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) { const modalSinonimo = this.modalService.show(SinonimoComponent, { - initialState: { sinonimos: sinonimosData }, + initialState: { + sinonimos: sinonimosData, + articulo: articulo + }, class: 'modal-promo modal-dialog-centered' }); modalSinonimo.content.onClose - .subscribe((res: any) => { - for (const a of articulo.productos) { - for (const aRes of res.articulos) { - if (a.idSinonimo === aRes.ID_SIN) { - a.CODA = aRes.CodArt; - a.CodArt = aRes.CodArt; - a.SECA = aRes.CodSec; - aRes.CodSec = aRes.CodSec; - a.PreVen = aRes.PreVen; - a.id = aRes.id; - a.DET_LAR = aRes.DET_LAR; - a.DetArt = aRes.DetArt; + .subscribe((res: any) => { + for (const a of articulo.productos) { + for (const aRes of res.articulos) { + if (a.idSinonimo === aRes.ID_SIN) { + a.CODA = aRes.CodArt; + a.CodArt = aRes.CodArt; + a.SECA = aRes.CodSec; + aRes.CodSec = aRes.CodSec; + a.PreVen = aRes.PreVen; + a.id = aRes.id; + a.DET_LAR = aRes.DET_LAR; + a.DetArt = aRes.DetArt; + } } } - } - this.articuloService.setArticulo(articulo); - }); -} + this.articuloService.setArticulo(articulo); + }); + } mediaPantalla() { if ($('body').hasClass('media-pantalla')) { diff --git a/src/app/shared/promocion/promocion.component.ts b/src/app/shared/promocion/promocion.component.ts index 66995d3..fe4cf1e 100644 --- a/src/app/shared/promocion/promocion.component.ts +++ b/src/app/shared/promocion/promocion.component.ts @@ -59,7 +59,10 @@ export class PromocionComponent implements OnInit { openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) { const modalSinonimo = this.modalService.show(SinonimoComponent, { - initialState: { sinonimos: sinonimosData }, + initialState: { + sinonimos: sinonimosData, + articulo: articulo + }, class: 'modal-promo modal-dialog-centered' }); diff --git a/src/app/shared/sinonimo/sinonimo.component.html b/src/app/shared/sinonimo/sinonimo.component.html index 1118576..2a93896 100644 --- a/src/app/shared/sinonimo/sinonimo.component.html +++ b/src/app/shared/sinonimo/sinonimo.component.html @@ -1,7 +1,7 @@