Marcelo Puebla / autoservicio-axion

Commit 1ca67421a564b465e76735362317a73f2ebb5279

Authored by Marcelo Puebla 2020-02-05 11:37:00 -0300

Exists in develop

Fix

Al seleccionar sinonimo

Showing 4 changed files with 16 additions and 24 deletions Show diff stats

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

Diff comments View file @ 1ca6742

 import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit } 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 { 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';
 import { FiltroCategoriasComponent } from './filtro-categorias/filtro-categorias.component';
 import * as _ from 'lodash';
 import { ANIMATIONS } from 'src/app/utils/animations';
 @Component({
   selector: 'app-seleccion-articulos',
   templateUrl: './seleccion-articulos.component.html',
   styleUrls: ['./seleccion-articulos.component.scss'],
   animations: [ANIMATIONS.EnterLeaveY]
 })
 export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDestroy {
   loading = true;
   timeoutHandler: any;
   urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
   articulos: IArticulo[] = [];
   auxArticulos: IArticulo[] = [];
   showQuantity = 100;
   searchTerm = '';
   ordenandoByVendidos = true;
   modalRef: BsModalRef;
   total = 0;
   @ViewChild(FiltroCategoriasComponent, { static: false }) filtroCategorias: FiltroCategoriasComponent;
   constructor(
     public articuloService: ArticuloService,
     private sinonimoService: SinonimoService,
     private modalService: BsModalService,
     private inactiveScreen: InactiveScreenService,
   ) { }
   ngOnInit() { }
   ngAfterViewInit(): void {
     this.filtroCategorias.getCategorias();
     this.mediaPantalla();
   }
   ngOnDestroy() {
     for (let i = 1; i <= this.modalService.getModalsCount(); i++) {
       this.modalService.hide(i);
     }
   }
   getProductos() {
     this.articuloService.getAll()
       .subscribe((result: IArticulo[]) => {
         this.articuloService.setArticulosSinImagen(result);
         if (this.filtroCategorias.queMostrar === 'ordenar') {
           this.filtroCategorias.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) => {
         console.error(error);
       });
   }
   setProductos() {
     this.articulos = JSON.parse(localStorage.getItem('articulos'));
     this.filterItems();
     this.loading = false;
   }
   filterItems() {
     if (this.filtroCategorias.categoriaActive === 0) {
       this.auxArticulos = this.articulos;
       return;
     }
     this.auxArticulos = this.articulos.filter(x => {
       return x.categoria_selfservice === this.filtroCategorias.categoriaActive;
     });
     this.ordenar();
   }
   ordenar() {
     if (this.ordenandoByVendidos) {
       this.auxArticulos.sort((a, b) => {
         return b.cantidadVendida - a.cantidadVendida;
       });
     }
   }
   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: any[]) => {
         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 {
           this.articuloService.setArticulo(articulo);
         }
       });
   }
   openModalPromos(articulo: IArticulo) {
     if (this.modalRef) return;
     this.articuloService.setArticulosSinImagen([articulo]);
     this.modalRef = this.modalService.show(PromocionComponent, {
       initialState: { articulosPromo: [articulo] },
       class: 'modal-dialog-centered',
       ignoreBackdropClick: true,
     });
     this.modalRef.content.onClose
       .subscribe(() => this.modalRef = null);
     this.mediaPantalla();
   }
   openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
     if (this.modalRef) return;
     this.modalRef = this.modalService.show(SinonimoComponent, {
       initialState: {
         sinonimos: sinonimosData,
         articulo
       },
       class: 'modal-dialog-centered',
       ignoreBackdropClick: true,
     });
     this.modalRef.content.onClose
       .subscribe((res: any) => {
         this.modalRef = null;
+        if (!res) return;
         for (const a of articulo.productos) {
           for (const aRes of res.articulos) {
             if (a.idSinonimo === aRes.ID_SIN) {
-              a.CODA = aRes.CodArt;
+              this.articuloService.changeArticulo(a, aRes);
-              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.mediaPantalla();
   }
   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,#cat-content,#content,.cat-btn,#boxCarrito,
         .cat-box,.img-categoria, .modal-content`)
         .addClass('media-pantalla')
         .addBack('media-pantalla');
     }
   }
 }

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

Diff comments View file @ 1ca6742

 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;
   maxCantidad = 50;
   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 >= this.maxCantidad) 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) {
         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,
             pedidoParaLlevar: localStorage.getItem('pedidoParaLlevar'),
             terminal: APP_SETTINGS.terminal
           })
             .subscribe((data) => {
               observer.next(data);
               observer.complete();
             }, err => {
               observer.error(err);
               observer.complete();
             });
         });
     });
   }
   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/header-publicidad/header-publicidad.component.ts

Diff comments View file @ 1ca6742

 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';
 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-header-publicidad',
   templateUrl: './header-publicidad.component.html',
   styleUrls: ['./header-publicidad.component.scss']
 })
 export class HeaderPublicidadComponent implements OnInit {
   urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
   publicidades: IPublicidad[] = [];
   modalRef: BsModalRef;
   modalSinonimo: BsModalRef;
   constructor(
     private publicidadService: PublicidadService,
     private articuloService: ArticuloService,
     private modalService: BsModalService,
     private sinonimoService: SinonimoService
   ) { }
   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) {
     if (this.modalRef) return;
     this.modalRef = this.modalService.show(PromocionComponent,
       {
         initialState: {
           idArticulo: articulo.id
         },
         class: 'modal-dialog-centered'
       });
   }
   openModalConfirmacion(articulo: IArticulo) {
     if (this.modalRef) return;
     this.articuloService.setArticulosSinImagen([articulo]);
     this.modalRef = this.modalService.show(ConfirmacionComponent,
       {
         initialState: {
           titleMessage: articulo.DET_LAR,
           imagenPath: articulo.imagenes.length ? articulo.imagenes[0].imagen : 'assets/img/imagen-no-encontrada.jpg',
           footerMessageFirst: `¿QUERÉS AGREGAR ESTE COMBO`,
           footerMessageSecond: `a tu carrito?`,
           footerConfirmation: articulo.PreVen
         },
         ignoreBackdropClick: true,
         class: 'modal-dialog-centered'
       });
     this.modalRef.content.onClose.subscribe((resClose) => {
       this.modalRef = null;
       if (!resClose) return;
       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));
     });
     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'
     });
     this.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;
+              this.articuloService.changeArticulo(a, aRes);
-              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);
       });
   }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $('#headerPublicidad,#headerPad').addClass('media-pantalla');
     }
   }
 }

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

Diff comments View file @ 1ca6742

 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.sinonimoService.getSinonimos(promo.CodSec, promo.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, promo);
         } else {
           promo.cantidad = 1;
           this.articuloService.setArticulo(promo);
           this.onClose.next();
           this.modalPromocion.hide();
         }
       }, 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;
         }
         for (const a of articulo.productos) {
           for (const aRes of res.articulos) {
             if (a.idSinonimo === aRes.ID_SIN) {
-              a.CODA = aRes.CodArt;
+              this.articuloService.changeArticulo(a, aRes);
-              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.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[]) => {
         this.promociones = res;
         this.loading = false;
       }, 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');
     }
   }
 }