Marcelo Puebla / autoservicio-axion

Commit 4bdc05ab710e98c40ba626452b2a201829467686

Authored by Marcelo Puebla 2020-02-07 09:56:04 -0300

Exists in develop

Fix

Cantidad restante

Showing 2 changed files with 6 additions and 2 deletions Show diff stats

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

Diff comments View file @ 4bdc05a

 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 => {
+            Object.keys(gruposArticulos).forEach((key, i) => {
               sinonimos.push({ productos: gruposArticulos[key] });
+              sinonimos[i].cantidad = articulo.productos[i].cantidad;
+              sinonimos[i].cantidadRestante = articulo.productos[i].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() {
     if ($('body').hasClass('media-pantalla')) {
       $('#headerPublicidad,#headerPad').addClass('media-pantalla');
     }
   }
 }

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

Diff comments View file @ 4bdc05a

 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');
-              Object.keys(gruposArticulos).forEach(key => {
+              Object.keys(gruposArticulos).forEach((key, i) => {
                 sinonimos.push({ productos: gruposArticulos[key] });
+                sinonimos[i].cantidad = promo.productos[i].cantidad;
+                sinonimos[i].cantidadRestante = promo.productos[i].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[]) => {
         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');
     }
   }
 }