Marcelo Puebla / autoservicio-axion

Commit 8cf19703ca19ffbd33a76bb670155631003fe9ef

Authored by Marcelo Puebla 2020-03-02 15:55:28 -0300

Exists in develop

Fix

Orden en que se muestran los sinonimos

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

src/app/interfaces/IArticulo.ts

Diff comments View file @ 8cf1970

 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;
   CODA?: number;
   CODP?: number;
   SECA?: number;
   SECP?: number;
   MKT_DESC?: string;
   NHA?: boolean;
   FECHA_VIGENCIA_HASTA?: Date;
   FECHA_VIGENCIA_DESDE?: Date;
   ExiVta?: number;
+  ORDEN_P? : number;
 }
 export interface ICodigoBarra {
   CodBar: string;
   CodArt: number;
   CodSec: string;
 }

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

Diff comments View file @ 8cf1970

 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';
 import { NoStockComponent } from './no-stock/no-stock.component';
 import { DateExtension } from 'src/app/utils/dateExtension';
 @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) {
     if (articulo.ExiVta < 1) {
       if (this.modalRef) return;
       this.modalRef = this.modalService.show(NoStockComponent, {
         class: 'modal-dialog-centered',
         backdrop: false,
         ignoreBackdropClick: true,
       });
       this.modalRef.content.onClose
         .subscribe(() => this.modalRef = null);
     } else {
       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');
+          const gruposArticulos = _.groupBy(res[0].productos, 'ORDEN_P');
-          Object.keys(gruposArticulos).forEach((key, i) => {
+          Object.keys(gruposArticulos).forEach(key => {
             sinonimos.push({ productos: gruposArticulos[key], });
-            for (const a of articulo.productos) {
-              if (key === a.idSinonimo.toString()) {
-                sinonimos[i].cantidad = sinonimos[i].cantidadRestante = a.cantidad;
-                continue;
-              }
-            }
           });
+          for (let j = 0; j < articulo.productos.length; j++) {
+            Object.keys(gruposArticulos).forEach((key, i) => {
+              if (gruposArticulos[key][i].ID_SIN.toString() === articulo.productos[j].idSinonimo.toString()) {
+                sinonimos[i].cantidad = sinonimos[i].cantidadRestante = articulo.productos[j].cantidad;
+              }
+            });
+          }
           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;
         articulo.productos = res.articulos;
         this.articuloService.setArticulo(articulo);
       });
     this.mediaPantalla();
   }
   deleteArticulo(index: number) {
     this.articuloService.deleteArticulo(index);
   }
   increaseShow() {
     this.showQuantity += 100;
   }
   validarFecha(fechaInicio: string, fechaFin: string) {
     return DateExtension.ValidateDateRange(fechaInicio, fechaFin);
   }
   @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`)

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

Diff comments View file @ 8cf1970

 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';
 import { NoStockComponent } from 'src/app/modules/seleccion-articulos/no-stock/no-stock.component';
 @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.ExiVta < 1) {
           if (this.modalRef) return;
           this.modalRef = this.modalService.show(NoStockComponent, {
             class: 'modal-dialog-centered',
             backdrop: false,
             ignoreBackdropClick: true,
           });
           this.modalRef.content.onClose
             .subscribe(() => this.modalRef = null);
         } else {
           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');
+            const gruposArticulos = _.groupBy(res[0].productos, 'ORDEN_P');
-            Object.keys(gruposArticulos).forEach((key, i) => {
+            Object.keys(gruposArticulos).forEach(key => {
               sinonimos.push({ productos: gruposArticulos[key], });
-              for (const a of articulo.productos) {
-                if (key === a.idSinonimo.toString()) {
-                  sinonimos[i].cantidad = sinonimos[i].cantidadRestante = a.cantidad;
-                  continue;
-                }
-              }
             });
+            for (let j = 0; j < articulo.productos.length; j++) {
+              Object.keys(gruposArticulos).forEach((key, i) => {
+                if (gruposArticulos[key][i].ID_SIN.toString() === articulo.productos[j].idSinonimo.toString()) {
+                  sinonimos[i].cantidad = sinonimos[i].cantidadRestante = articulo.productos[j].cantidad;
+                }
+              });
+            }
             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) => {
         this.modalSinonimo = null;
         if (!res) return;
         articulo.productos = res.articulos;
         this.articuloService.setArticulo(articulo);
       });
   }
   mediaPantalla() {

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

Diff comments View file @ 8cf1970

 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, 'ID_SIN');
+              const gruposArticulos = _.groupBy(res[0].productos, 'ORDEN_P');
-              Object.keys(gruposArticulos).forEach((key, i) => {
+              Object.keys(gruposArticulos).forEach(key => {
                 sinonimos.push({ productos: gruposArticulos[key], });
-                for (const a of promo.productos) {
-                  if (key === a.idSinonimo.toString()) {
-                    sinonimos[i].cantidad = sinonimos[i].cantidadRestante = a.cantidad;
-                    continue;
-                  }
-                }
               });
+              for (let j = 0; j < promo.productos.length; j++) {
+                Object.keys(gruposArticulos).forEach((key, i) => {
+                  if (gruposArticulos[key][i].ID_SIN.toString() === promo.productos[j].idSinonimo.toString()) {
+                    sinonimos[i].cantidad = sinonimos[i].cantidadRestante = promo.productos[j].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() {