Marcelo Puebla / autoservicio-axion

Commit 5bcde6bae25263a6014469eab6440c2239df434f

Authored by Marcelo Puebla 2020-01-31 12:47:20 -0300

Exists in develop

Fix

Desuscribo cuando se destruye compoenentes

Showing 2 changed files with 9 additions and 3 deletions Show diff stats

src/app/modules/pago-electronico/pago-electronico.component.ts

Diff comments View file @ 5bcde6b

 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { Router } from '@angular/router';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
 import { BsModalService } from 'ngx-bootstrap/modal';
 import { ErrorFormaPagoComponent } from 'src/app/shared/error-forma-pago/error-forma-pago.component';
+import { Subscription } from "rxjs";
 @Component({
   selector: 'app-pago-electronico',
   templateUrl: './pago-electronico.component.html',
   styleUrls: ['./pago-electronico.component.scss']
 })
 export class PagoElectronicoComponent implements OnInit, OnDestroy {
   urlQr = `${APP_SETTINGS.apiImagenes}/qr/${APP_SETTINGS.deploy}/${APP_SETTINGS.codigoP}/tienda/${APP_SETTINGS.terminal}`;
+  subscription: Subscription;
   constructor(
     private articuloService: ArticuloService,
     private router: Router,
     private modalService: BsModalService,
   ) { }
   ngOnInit() {
     if (!this.articuloService.carrito.length) {
       this.router.navigate(['']);
       return;
     }
     const dataPago = {
       pedidoAnombreDe: ''
     };
     dataPago.pedidoAnombreDe = '';
-    this.articuloService.pay(dataPago)
+    this.subscription = this.articuloService.pay(dataPago)
       .subscribe((res: any) => {
         this.articuloService.idComanda = res.data;
         this.router.navigate(['mensaje-final']);
       }, (err) => {
         this.modalService.show(ErrorFormaPagoComponent, {
           class: 'modal-lg modal-dialog-centered',
           ignoreBackdropClick: true,
         });
       });
     this.mediaPantalla();
   }
   ngOnDestroy() {
+    if (this.subscription) this.subscription.unsubscribe();
     for (let i = 1; i <= this.modalService.getModalsCount(); i++) {
       this.modalService.hide(i);
     }
   }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $('.qr-mt').addClass('media-pantalla');
     }
   }
 }

src/app/modules/pago-tarjeta/pago-tarjeta.component.ts

Diff comments View file @ 5bcde6b

 import { Component, OnInit, TemplateRef, OnDestroy, ViewChild } from '@angular/core';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { Router } from '@angular/router';
 import { BsModalService } from 'ngx-bootstrap/modal';
 import { ErrorFormaPagoComponent } from 'src/app/shared/error-forma-pago/error-forma-pago.component';
+import { Subscription } from 'rxjs';
 @Component({
   selector: 'app-pago-tarjeta',
   templateUrl: './pago-tarjeta.component.html',
   styleUrls: ['./pago-tarjeta.component.scss']
 })
 export class PagoTarjetaComponent implements OnInit, OnDestroy {
   timer: any;
-  @ViewChild('template', {static: true}) public template: TemplateRef<any>;
+  subscription: Subscription;
+  @ViewChild('template', { static: true }) public template: TemplateRef<any>;
   constructor(
     private articuloService: ArticuloService,
     private router: Router,
     private modalService: BsModalService,
   ) { }
   ngOnInit() {
     if (!this.articuloService.carrito.length) {
       this.router.navigate(['']);
       return;
     }
     this.openModalEspera(this.template);
     const dataPago = {
       pedidoAnombreDe: ''
     };
-    this.articuloService.pay(dataPago)
+    this.subscription = this.articuloService.pay(dataPago)
       .subscribe((res: any) => {
         this.articuloService.idComanda = res.data;
         this.router.navigate(['mensaje-final']);
       }, (err) => {
         this.modalService.show(ErrorFormaPagoComponent, {
           class: 'modal-lg modal-dialog-centered',
           ignoreBackdropClick: true,
         });
       });
     this.mediaPantalla();
   }
   ngOnDestroy() {
+    if (this.subscription) this.subscription.unsubscribe();
     if (this.timer) clearTimeout(this.timer);
     for (let i = 1; i <= this.modalService.getModalsCount(); i++) {
       this.modalService.hide(i);
     }
   }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $('.pago-tarjeta').addClass('media-pantalla');
     }
   }
   openModalEspera(templateRef: TemplateRef<any>) {
     const modalRef = this.modalService.show(templateRef, { class: 'modal-lg modal-dialog-centered' });
     this.timer = setTimeout(() => {
       modalRef.hide();
     }, 5000);
   }
 }