Luis Suarez / autoservicio-axion

Download as
Browse Code »

Commit 75cc19975708ce203363a93d5d25ff7bbb9db00f

Authored by Marcelo Puebla
2 parents 373baac2fe df2615f81c
Exists in develop

Merge branch 'develop' into 'develop' 

Develop

categorias con 0 articulos no se muestran desde front

See merge request !137
Showing 5 changed files   Show diff stats
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.component.html
Diff comments   View file @ 75cc199
... ... @@ -12,10 +12,10 @@
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-7 p-5 m-5 h-auto align-self-center
16   - btn-effect border border-primary rounded reduce-card-2">
  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">
17 17 <div class="row h-auto">
18   - <div class="col-12 col-md-4">
  18 + <div class="col-12 col-md-12">
19 19 <img
20 20 draggable="false"
21 21 ondragstart="return false;"
... ... @@ -23,13 +23,13 @@
23 23 class="w-100 h-auto bg-white"
24 24 src="assets/img/tarjeta-banda.jpg"/>
25 25 </div>
26   - <div class="col-12 col-md-8 h-auto">
  26 + <div class="col-12 col-md-12 h-auto">
27 27 <p class="h2 m-0 text-primary">Banda Magnética</p>
28 28 <small class=" m-0">
29 29 DESLIZÁ LA TARJETA POR LA RANURA<br>
30 30 CUANDO LA PANTALLA LO INDIQUE
31 31 </small>
32   - <div class="btn-effect col-10 px-0 bg-white mt-4 mx-auto">
  32 + <div class="btn-effect col-12 px-0 bg-white mt-4 mx-auto">
33 33 <div class="row mx-0 bg-primary badge-pill h-auto">
34 34 <div class="col-10 align-self-center text-center text-white">
35 35 Continuar
... ... @@ -48,10 +48,10 @@
48 48 </div>
49 49 </div>
50 50 <div
51   - class="col-12 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center
52   - btn-effect border border-primary rounded reduce-card-2">
  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">
53 53 <div class="row h-auto">
54   - <div class="col-12 col-md-4">
  54 + <div class="col-12 col-md-12">
55 55 <img
56 56 draggable="false"
57 57 ondragstart="return false;"
... ... @@ -59,14 +59,14 @@
59 59 class="w-100 h-auto bg-white"
60 60 src="assets/img/tarjeta-chip.jpg"/>
61 61 </div>
62   - <div class="col-12 col-md-8 h-auto">
  62 + <div class="col-12 col-md-12 h-auto">
63 63 <p class="h2 m-0 text-primary">Chip</p>
64 64 <small class=" m-0">
65 65 INTRODUCÍ TU TARJETA POR LA<br>
66 66 PARTE INFERIOR DE LECTOR <br>
67 67 CUANDO LA PANTALLA LO INDIQUE
68 68 </small>
69   - <div class="btn-effect col-10 px-0 bg-white mt-4 mx-auto">
  69 + <div class="btn-effect col-12 px-0 bg-white mt-4 mx-auto">
70 70 <div class="row mx-0 bg-primary badge-pill h-auto">
71 71 <div class="col-10 align-self-center text-center text-white">
72 72 Continuar
... ... @@ -85,10 +85,10 @@
85 85 </div>
86 86 </div>
87 87 <div
88   - class="col-12 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center
89   - btn-effect border border-primary rounded reduce-card-2">
  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">
90 90 <div class="row h-auto">
91   - <div class="col-12 col-md-4">
  91 + <div class="col-12 col-md-12">
92 92 <img
93 93 draggable="false"
94 94 ondragstart="return false;"
... ... @@ -96,16 +96,16 @@
96 96 class="w-100 h-auto bg-white"
97 97 src="assets/img/tarjeta-contact-less.jpg"/>
98 98 </div>
99   - <div class="col-12 col-md-8 h-auto">
  99 + <div class="col-12 col-md-12 h-auto">
100 100 <p class="h2 m-0 text-primary">Contact-less</p>
101 101 <small class=" m-0">
102 102 ACERCÁ LA TARJETA AL POSNET<br>
103 103 CUANDO LA PANTALLA LO INDIQUE
104 104 </small>
105   - <div class="btn-effect col-10 px-0 bg-white mt-4 mx-auto">
  105 + <div class="btn-effect col-12 px-0 bg-white mt-4 mx-auto">
106 106 <div class="row mx-0 bg-primary badge-pill h-auto">
107 107 <div class="col-10 align-self-center text-center text-white">
108   - Continuar
  108 + <small>Continuar</small>
109 109 </div>
110 110 <div class="col-2 align-self-center p-0">
111 111 <img
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.component.scss
Diff comments   View file @ 75cc199
... ... @@ -0,0 +1,5 @@
  1 +.reduce-card-1.media-pantalla {
  2 + max-width: 30% !important;
  3 + margin: 0px 15px !important;
  4 + height: 670px !important;
  5 +}
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.component.ts
Diff comments   View file @ 75cc199
... ... @@ -6,8 +6,15 @@ import { Component, OnInit, OnChanges } from &#39;@angular/core&#39;;
6 6 styleUrls: ['./indicaciones-pago-tarjeta.component.scss']
7 7 })
8 8 export class IndicacionesPagoTarjetaComponent implements OnInit {
9   - mediaPantalla: boolean;
10 9 constructor() { }
11 10  
12   - ngOnInit() {}
  11 + ngOnInit() {
  12 + this.mediaPantalla();
  13 + }
  14 +
  15 + mediaPantalla() {
  16 + if ($('body').hasClass('media-pantalla')) {
  17 + $('.reduce-card').addClass('media-pantalla');
  18 + }
  19 + }
13 20 }
src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.html
Diff comments   View file @ 75cc199
... ... @@ -31,22 +31,24 @@
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
35   - class="row mx-2 mb-2 h-25 h-lg-30 justify-content-center tab cat-content"
36   - [ngClass]="{ 'active rounded shadow px-2': categoria.selected,
37   - 'border-bottom-effect': !categoria.selected,
38   - 'media-pantalla': templateCategorias.classList.contains('media-pantalla')}"
39   - (click)="selectCategoria(i, categoria.id)"
40   - id="cat-content"
41   - *ngFor="let categoria of categorias; let i = index;">
42   - <img
  34 + <div *ngFor="let categoria of categorias; let i = index;">
  35 + <div
  36 + class="row mx-2 mb-2 h-25 h-lg-30 justify-content-center tab cat-content"
  37 + [ngClass]="{ 'active rounded shadow px-2': categoria.selected,
  38 + 'border-bottom-effect': !categoria.selected,
  39 + 'media-pantalla': templateCategorias.classList.contains('media-pantalla')}"
  40 + (click)="selectCategoria(i, categoria.id)"
  41 + id="cat-content"
  42 + *ngIf="categoria.articulos > 0">
  43 + <img
43 44 draggable="false"
44 45 ondragstart="return false;"
45 46 (contextmenu)="false"
46   - class="d-none d-sm-block rounded-circle w-auto h-75"
  47 + class="d-none d-sm-block rounded-circle w-auto h-auto col-12"
47 48 src="{{urlImagenes}}{{categoria.path_imagen}}"
48 49 onerror="this.src='assets/img/imagen-no-encontrada.jpg'">
49   - <small class="col-12 px-1 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small>
  50 + <small class="col-12 px-1 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small>
  51 + </div>
50 52 </div>
51 53 </div>
52 54 <div class="col-auto btn-effect h-5 cat-btn">
src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.ts
Diff comments   View file @ 75cc199
... ... @@ -22,7 +22,7 @@ export class FiltroCategoriasComponent implements OnInit {
22 22  
23 23 constructor(
24 24 private categoriaService: CategoriaService,
25   - private inactiveScreen: InactiveScreenService,
  25 + private inactiveScreen: InactiveScreenService
26 26 ) { }
27 27  
28 28 ngOnInit() {
... ... @@ -67,6 +67,7 @@ export class FiltroCategoriasComponent implements OnInit {
67 67 categoria.selected = index === i ? true : false;
68 68 });
69 69 this.filterItems.emit();
  70 +
70 71 }
71 72  
72 73 @HostListener('scroll', ['$event'])