Luis Suarez / autoservicio-axion

Download as
Browse Code »

Commit 98b8c1ae52fcded5cba33ba32f2ed8c7f3ca8215

Authored by Marcelo Puebla
2 parents e7ad30b837 cd76e82cc3
Exists in develop

Merge branch 'develop' into 'develop' 

Develop

agrega vista indicaciones pago tarjetas y soluciona vigencia de categorias

See merge request !149
Showing 5 changed files   Show diff stats
src/app/modules/forma-pago/forma-pago.component.ts
Diff comments   View file @ 98b8c1a
... ... @@ -25,7 +25,7 @@ export class FormaPagoComponent implements OnInit {
25 25 this.articuloService.medioPago = medioPago;
26 26 switch (medioPago) {
27 27 case 4:
28   - this.router.navigate(['pago-tarjeta']);
  28 + this.router.navigate(['indicaciones-pago-tarjeta']);
29 29 break;
30 30 case 9:
31 31 this.router.navigate(['pago-electronico']);
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.component.html
Diff comments   View file @ 98b8c1a
... ... @@ -12,10 +12,13 @@
12 12 <div class="h-85">
13 13 <div class="row h-auto mt-6 mx-0 justify-content-center text-center">
14 14 <div
15   - class="col-12 col-sm-10 col-md-4 p-5 ml-auto h-auto align-self-center
16   - btn-effect border border-primary rounded reduce-card-1">
  15 + #card
  16 + class="p-5 mx-auto mt-4 h-30 align-self-center
  17 + btn-effect border border-primary rounded reduce-card-1"
  18 + [ngClass]="card.classList.contains('media-pantalla') ? 'col-md-4' : 'col-md-8'"
  19 + [routerLink]="['/pago-tarjeta']">
17 20 <div class="row h-auto">
18   - <div class="col-12 col-md-12">
  21 + <div [ngClass]="card.classList.contains('media-pantalla') ? 'col-12' : 'col-4'">
19 22 <img
20 23 draggable="false"
21 24 ondragstart="return false;"
... ... @@ -23,7 +26,8 @@
23 26 class="w-100 h-auto bg-white"
24 27 src="assets/img/tarjeta-banda.jpg"/>
25 28 </div>
26   - <div class="col-12 col-md-12 h-auto">
  29 + <div class="h-auto"
  30 + [ngClass]="card.classList.contains('media-pantalla') ? 'col-12' : 'col-8'">
27 31 <p class="h2 m-0 text-primary">Banda Magnética</p>
28 32 <small class=" m-0">
29 33 DESLIZÁ LA TARJETA POR LA RANURA<br>
... ... @@ -48,10 +52,12 @@
48 52 </div>
49 53 </div>
50 54 <div
51   - class="col-12 col-sm-10 col-md-4 p-5 my-auto mx-3 h-auto align-self-center
52   - btn-effect border border-primary rounded reduce-card-1">
  55 + class="p-5 mx-auto mt-6 h-auto align-self-center
  56 + btn-effect border border-primary rounded reduce-card-1"
  57 + [ngClass]="card.classList.contains('media-pantalla') ? 'col-md-4' : 'col-md-8'"
  58 + [routerLink]="['/pago-tarjeta']">
53 59 <div class="row h-auto">
54   - <div class="col-12 col-md-12">
  60 + <div [ngClass]="card.classList.contains('media-pantalla') ? 'col-12' : 'col-4'">
55 61 <img
56 62 draggable="false"
57 63 ondragstart="return false;"
... ... @@ -59,7 +65,9 @@
59 65 class="w-100 h-auto bg-white"
60 66 src="assets/img/tarjeta-chip.jpg"/>
61 67 </div>
62   - <div class="col-12 col-md-12 h-auto">
  68 + <div
  69 + class="h-auto"
  70 + [ngClass]="card.classList.contains('media-pantalla') ? 'col-12' : 'col-8'">
63 71 <p class="h2 m-0 text-primary">Chip</p>
64 72 <small class=" m-0">
65 73 INTRODUCÍ TU TARJETA POR LA<br>
... ... @@ -68,7 +76,8 @@
68 76 </small>
69 77 <div class="btn-effect col-12 px-0 bg-white mt-4 mx-auto">
70 78 <div class="row mx-0 bg-primary badge-pill h-auto">
71   - <div class="col-10 align-self-center text-center text-white">
  79 + <div
  80 + class="col-10 align-self-center text-center text-white">
72 81 Continuar
73 82 </div>
74 83 <div class="col-2 align-self-center p-0">
... ... @@ -85,10 +94,12 @@
85 94 </div>
86 95 </div>
87 96 <div
88   - class="col-12 col-sm-10 col-md-4 p-5 mr-auto h-auto align-self-center
89   - btn-effect border border-primary rounded reduce-card-1">
  97 + class="col-sm-10 col-md-4 p-5 mx-auto mt-6 align-self-center
  98 + btn-effect border border-primary rounded reduce-card-1"
  99 + [ngClass]="card.classList.contains('media-pantalla') ? 'col-md-4' : 'col-md-8'"
  100 + [routerLink]="['/pago-tarjeta']">
90 101 <div class="row h-auto">
91   - <div class="col-12 col-md-12">
  102 + <div [ngClass]="card.classList.contains('media-pantalla') ? 'col-12' : 'col-4'">
92 103 <img
93 104 draggable="false"
94 105 ondragstart="return false;"
... ... @@ -96,7 +107,9 @@
96 107 class="w-100 h-auto bg-white"
97 108 src="assets/img/tarjeta-contact-less.jpg"/>
98 109 </div>
99   - <div class="col-12 col-md-12 h-auto">
  110 + <div
  111 + class="h-auto"
  112 + [ngClass]="card.classList.contains('media-pantalla') ? 'col-12' : 'col-8'">
100 113 <p class="h2 m-0 text-primary">Contact-less</p>
101 114 <small class=" m-0">
102 115 ACERCÁ LA TARJETA AL POSNET<br>
... ... @@ -104,7 +117,8 @@
104 117 </small>
105 118 <div class="btn-effect col-12 px-0 bg-white mt-4 mx-auto">
106 119 <div class="row mx-0 bg-primary badge-pill h-auto">
107   - <div class="col-10 align-self-center text-center text-white">
  120 + <div
  121 + class="col-10 align-self-center text-center text-white">
108 122 <small>Continuar</small>
109 123 </div>
110 124 <div class="col-2 align-self-center p-0">
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.component.scss
Diff comments   View file @ 98b8c1a
... ... @@ -3,3 +3,7 @@
3 3 margin: 0px 15px !important;
4 4 height: 670px !important;
5 5 }
  6 +
  7 +.mt-6 {
  8 + margin-top: 4.5rem;
  9 +}
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.component.ts
Diff comments   View file @ 98b8c1a
... ... @@ -14,7 +14,7 @@ export class IndicacionesPagoTarjetaComponent implements OnInit {
14 14  
15 15 mediaPantalla() {
16 16 if ($('body').hasClass('media-pantalla')) {
17   - $('.reduce-card').addClass('media-pantalla');
  17 + $('.reduce-card-1').addClass('media-pantalla');
18 18 }
19 19 }
20 20 }
src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.html
Diff comments   View file @ 98b8c1a
... ... @@ -31,7 +31,7 @@
31 31 src="assets/img/logo-spot.svg">
32 32 <small class="col-12 px-0 my-1 h-100 h-md-25 align-self-end text-center text-truncate">Todos</small>
33 33 </div>
34   - <div *ngFor="let categoria of categorias; let i = index;">
  34 +
35 35 <div
36 36 class="row mx-2 mb-2 h-25 h-lg-30 justify-content-center tab cat-content"
37 37 [ngClass]="{ 'active rounded shadow px-2': categoria.selected,
... ... @@ -39,8 +39,9 @@
39 39 'media-pantalla': templateCategorias.classList.contains('media-pantalla')}"
40 40 (click)="selectCategoria(i, categoria.id)"
41 41 id="cat-content"
42   - *ngIf="categoria.articulos > 0
43   - && validarFecha(categoria.vigencia_desde, categoria.vigencia_hasta)">
  42 + *ngFor="let categoria of categorias; let i = index;"
  43 + [hidden]="categoria.articulos > 0
  44 + && validarFecha(categoria.vigencia_desde, categoria.vigencia_hasta)">
44 45 <img
45 46 draggable="false"
46 47 ondragstart="return false;"
... ... @@ -50,7 +51,7 @@
50 51 onerror="this.src='assets/img/imagen-no-encontrada.jpg'">
51 52 <small class="col-12 px-1 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small>
52 53 </div>
53   - </div>
  54 +
54 55 </div>
55 56 <div class="col-auto btn-effect h-5 cat-btn">
56 57 <img