Merge branch 'develop' into 'develop'

Develop See merge request !107

Merge branch 'develop' into 'develop'
Develop See merge request !107
Marcelo Puebla
2 parents c0e896052b e634738c94
Showing 2 changed files Show diff stats
src/app/shared/error-forma-pago/error-forma-pago.component.html
src/app/shared/error-forma-pago/error-forma-pago.component.ts
@@ -6,7 +6,8 @@
       (contextmenu)="false"
       class="d-block mx-auto icon-50"
       src="assets/img/x-amarilla.svg">
-    <p class="text-white text-center m-3">Algo salió mal, intentalo de nuevo o probá con otra forma de pago</p>
+    <p class="h1 text-white text-center mx-3 mt-3">Algo salió mal, intentalo de nuevo o</p>
+    <p class="h1 text-white text-center mx-3 mb-3">probá con otra forma de pago</p>
     <div
       class="d-inline-block py-1 btn-effect bg-white badge-pill"
       (click)="continuar()">
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { Location } from '@angular/common';
 import { BsModalRef } from 'ngx-bootstrap/modal';
  
 @Component({
@@ -10,14 +10,14 @@ import { BsModalRef } from &#39;ngx-bootstrap/modal&#39;;
 export class ErrorFormaPagoComponent implements OnInit {
  
   constructor(
-    private router: Router,
+    private location: Location,
     private modalRef: BsModalRef,
   ) { }
  
   ngOnInit() { }
  
   continuar() {
-    this.router.navigate(['forma-pago']);
+    this.location.back();
     this.modalRef.hide();
   }
...	...	@@ -6,7 +6,8 @@
6	6	(contextmenu)="false"
7	7	class="d-block mx-auto icon-50"
8	8	src="assets/img/x-amarilla.svg">
9		- <p class="text-white text-center m-3">Algo salió mal, intentalo de nuevo o probá con otra forma de pago</p>
	9	+ <p class="h1 text-white text-center mx-3 mt-3">Algo salió mal, intentalo de nuevo o</p>
	10	+ <p class="h1 text-white text-center mx-3 mb-3">probá con otra forma de pago</p>
10	11	<div
11	12	class="d-inline-block py-1 btn-effect bg-white badge-pill"
12	13	(click)="continuar()">
1	1	import { Component, OnInit } from '@angular/core';
2		-import { Router } from '@angular/router';
	2	+import { Location } from '@angular/common';
3	3	import { BsModalRef } from 'ngx-bootstrap/modal';
4	4
5	5	@Component({
...	...	@@ -10,14 +10,14 @@ import { BsModalRef } from 'ngx-bootstrap/modal';
10	10	export class ErrorFormaPagoComponent implements OnInit {
11	11
12	12	constructor(
13		- private router: Router,
	13	+ private location: Location,
14	14	private modalRef: BsModalRef,
15	15	) { }
16	16
17	17	ngOnInit() { }
18	18
19	19	continuar() {
20		- this.router.navigate(['forma-pago']);
	20	+ this.location.back();
21	21	this.modalRef.hide();
22	22	}
23	23