Luis Suarez / autoservicio-axion

Commit 36f686b8f8e2fa6e0507e3559161f704d8eda733

Authored by Marcelo Puebla 2020-02-21 17:11:50 -0300

Exists in develop

Merge branch 'develop' into 'develop'

Develop

See merge request !154

Showing 4 changed files Show diff stats

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

Diff comments View file @ 36f686b

 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;
+    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) {
         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,
             contactLess: true,
           })
             .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/promocion/promocion.component.html

Diff comments View file @ 36f686b

 <div class="bg-primary rounded">
   <div class="modal-header" *ngIf="articulosPromo.length">
     <img
       draggable="false"
       ondragstart="return false;"
       (contextmenu)="false"
       (click)="selectPromo(articulosPromo[0])"
       class="btn-effect icon-30 mt-2 mr-2 position-absolute top-0 right-0 z-index"
       src="assets/img/icono-cancelar-blanco.svg">
     <div class="row w-100 no-gutters justify-content-between">
       <div class="col align-self-center">
         <p class="h3 text-white">{{articulosPromo[0].MKT_DESC ? articulosPromo[0].MKT_DESC.toUpperCase() : articulosPromo[0].DetArt.toUpperCase()}}</p>
       </div>
       <div class="col-auto align-self-center mt-4 pl-2">
         <div
           class="row mx-0 justify-content-between bg-white badge-pill btn-effect"
           (click)="selectPromo(articulosPromo[0])">
           <div class="col-auto align-self-center text-primary">
             <p class="font-weight-bold">{{articulosPromo[0].PreVen | currency}}</p>
           </div>
           <div class="col-auto px-0">
             <img
               draggable="false"
               ondragstart="return false;"
               (contextmenu)="false"
               class="d-block ml-auto my-1 icon-20"
               src="assets/img/ir-color.svg">
           </div>
         </div>
       </div>
     </div>
   </div>
   <div class="modal-body" *ngIf="articulosPromo.length">
-    <div class="row no-gutters w-100">
+    <div
+      class="row no-gutters w-100"
+      *ngIf="promociones.length && !loading">
       <div class="col-9 col-9 align-self-center">
         <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p>
         <p class="h1 text-white">en un combo?</p>
       </div>
       <div class="col-3">
         <img
           draggable="false"
           ondragstart="return false;"
           (contextmenu)="false"
           src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}"
           onerror="this.src='assets/img/imagen-no-encontrada.jpg'"
           class="card-img-top img-fluid rounded-circle">
       </div>
     </div>
+    <div>
+    <div
+      class="row no-gutters w-100"
+      *ngIf="!promociones.length && !loading">
+      <div class="col-12 text-center">
+        <p class="text-white"><small>NO HAY PROMOS CON STOCK</small></p>
+      </div>
+    </div>
     <div
       class="d-flex justify-content-center mt-2"
       *ngIf="loading">
       <div class="spinner-border text-white" role="status">
         <span class="sr-only">Loading...</span>
       </div>
     </div>
     <div
       class="row mt-3 no-gutters lista-promociones scroll-y-visible"
       (scroll)="scrollEvent($event)">
       <div class="col-12">
         <div *ngFor="let promo of promociones; let i = index">
           <div
             [ngClass]="{ 'mt-2': i !== 0 }"
             class="btn-effect bg-white badge-pill text-primary"
             (click)="selectPromo(promo)">
             <div class="d-flex">
               <p class="text-truncate mr-auto my-auto"><small>{{promo.MKT_DESC ? promo.MKT_DESC.toUpperCase() : promo.DetArt.toUpperCase()}}</small></p>
               <p class="font-weight-bold ml-auto my-auto pr-2">
                 <span>{{promo.PreVen | currency}}</span>
               </p>
               <img
                 draggable="false"
                 ondragstart="return false;"
                 (contextmenu)="false"
                 class="d-block py-1 icon-30"
                 src="assets/img/ir-color.svg">
             </div>
           </div>
         </div>
       </div>
     </div>
   </div>
 </div>

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

Diff comments View file @ 36f686b

 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, i) => {
                 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;
                   }
                 }
               });
               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;
+        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');
     }
   }
 }

src/app/shared/sinonimo/sinonimo.component.html

Diff comments View file @ 36f686b

 <div class="bg-primary rounded text-white">
   <div class="modal-header">
     <img
       draggable="false"
       ondragstart="return false;"
       (contextmenu)="false"
       (click)="close()"
       class="btn-effect icon-30 mt-2 mr-2 position-absolute right-0 top-0 z-index"
       src="assets/img/icono-cancelar-blanco.svg">
     <p class="col-12 h4 px-0 align-self-center">{{ articulo.MKT_DESC ? articulo.MKT_DESC.toUpperCase() : articulo.DetArt.toUpperCase() }}</p>
   </div>
   <div class="modal-body my-2">
     <p class="mb-2 h4">Opcion {{currentIndex+1}}</p>
     <p class="mb-2 h5">Cantidad restante {{sinonimos[currentIndex].cantidadRestante}}</p>
     <div class="lista-sinonimos scroll-y-visible">
       <div
         class="row mx-0 mb-2 fade-in-left"
-        *ngFor="let articulo of sinonimos[currentIndex].productos">
+        *ngFor="let articulo of sinonimos[currentIndex].productos"
+        [hidden]="articulo.ExiVta <= 0">
         <div class="col-8 p-0 my-auto h6 text-right">
           <p class="m-0 font-weight-normal">
             {{articulo.MKT_DESC ? articulo.MKT_DESC.toUpperCase() : articulo.DetArt.toUpperCase()}}
           </p>
         </div>
         <div class="col-4">
           <div class="row mx-0 justify-content-between border border-white badge-pill">
             <!-- BOTON MENOS -->
             <div class="col-auto px-0 my-auto">
               <img
                 draggable="false"
                 ondragstart="return false;"
                 (contextmenu)="false"
                 class="d-block ml-auto py-2 icon-30 btn-effect"
                 src="assets/img/menos-blanco.svg"
                 (click)="restarCantidadSinonimo(articulo, currentIndex)">
             </div>
             <!-- CANTIDAD -->
             <div class="col px-0 my-auto text-white text-center">
               <p>{{articulo.cantidad}}</p>
             </div>
             <!-- BOTON MAS -->
             <div class="col-auto px-0 my-auto">
               <img
                 draggable="false"
                 ondragstart="return false;"
                 (contextmenu)="false"
                 class="d-block ml-auto py-2 icon-30 btn-effect"
                 src="assets/img/mas-blanco.svg"
                 (click)="sumarCantidadSinonimo(articulo, currentIndex)">
             </div>
           </div>
         </div>
       </div>
     </div>
   </div>
   <div class="modal-footer">
     <div
       *ngIf="currentIndex != 0 && sinonimos.length > 1"
       class="d-inline-block py-1 bg-white badge-pill text-primary btn-effect mr-auto fade-in-right"
       (click)="currentIndex = currentIndex-1">
       <img
         draggable="false"
         ondragstart="return false;"
         (contextmenu)="false"
         class="icon-30 flip"
         src="assets/img/ir-color.svg">
       VOLVER
     </div>
     <div
       [ngClass]="validateNext()"
       *ngIf="currentIndex != sinonimos.length-1"
       class="d-inline-block py-1 bg-white badge-pill text-primary ml-auto fade-in-left"
       (click)="goNext()">
       SIGUIENTE
       <img
         draggable="false"
         ondragstart="return false;"
         (contextmenu)="false"
         class="icon-30"
         src="assets/img/ir-color.svg">
     </div>
     <div
       [ngClass]="validate()"
       *ngIf="currentIndex == sinonimos.length-1"
       class="d-inline-block py-1 bg-white badge-pill text-primary ml-auto fade-in-left"
       (click)="continue()">
       CONTINUAR
       <img
         draggable="false"
         ondragstart="return false;"
         (contextmenu)="false"
         class="icon-30"
         src="assets/img/ir-color.svg">
     </div>
   </div>
 </div>