Martin Macola / autoservicio

Download as
Browse Code »

Commit 8182d5cf0a80c456c62535223f19f75824ae511e

Authored by Eric Fernandez
2 parents aa9e329a84 f8ffc98aab
Exists in master

Merge branch 'master' of http://git.focasoftware.com/angular/autoservicio

Showing 9 changed files   Show diff stats
src/app/components/amb-imagenes/amb-imagenes.component.html
Diff comments   View file @ 8182d5c
... ... @@ -32,7 +32,7 @@
32 32 </thead>
33 33 <tbody>
34 34 <tr *ngFor="let articulo of auxProductos">
35   - <td>{{articulo.DetArt}}</td>
  35 + <td>{{articulo.DET_LAR}}</td>
36 36 <td>{{articulo.DET_LAR}}</td>
37 37 <td>
38 38 <img *ngIf="articulo.imagenes.length" src="{{apiUrl}}/imagenes/{{articulo.imagenes[0].imagen}}">
src/app/components/amb-imagenes/amb-imagenes.component.ts
Diff comments   View file @ 8182d5c
... ... @@ -50,7 +50,7 @@ export class AmbImagenesComponent implements OnInit {
50 50 filterItems() {
51 51  
52 52 this.auxProductos = this.articulos.filter(x => {
53   - return x.DetArt.toLowerCase().includes(this.searchTerm.toLowerCase())
  53 + return x.DET_LAR.toLowerCase().includes(this.searchTerm.toLowerCase())
54 54 });
55 55 }
56 56  
src/app/components/busqueda-productos/busqueda-productos.component.html
Diff comments   View file @ 8182d5c
... ... @@ -73,15 +73,10 @@
73 73 (click)="elegirProducto(producto)">
74 74 <img src="{{apiUrl}}/imagenes/{{producto.imagenes[0].imagen}}" class="rounded-sm w-100 m-auto">
75 75 <div class="p-2">
76   - <p class="h6 text-left m-0">{{producto.DetArt}}</p>
77   - <div class="row justify-content-between m-0">
78   - <div class="col-12 p-0">
79   - <div class="text-left">
80   - <p class="m-0 h6"><small>{{producto.DET_LAR}}</small></p>
81   - </div>
82   - </div>
  76 + <p class="h6 min-h-40 text-left m-0"><small>{{producto.DET_LAR}}</small></p>
  77 + <div class="row m-0">
83 78 <div class="col-12 my-auto pt-2 pr-2 p-0">
84   - <p class="text-right m-0 h6">{{producto.PreVen | currency}}</p>
  79 + <p class="text-right m-0 h6">{{producto.PreVen | currency}}</p>
85 80 </div>
86 81 </div>
87 82 </div>
src/app/components/busqueda-productos/busqueda-productos.component.ts
Diff comments   View file @ 8182d5c
... ... @@ -86,10 +86,10 @@ export class BusquedaProductosComponent implements OnInit {
86 86  
87 87 this.auxProductos = this.productos.filter(x => {
88 88 if (this.categoriaActive === 0) {
89   - return x.DetArt.toLowerCase().includes(this.searchTerm.toLowerCase());
  89 + return x.DET_LAR.toLowerCase().includes(this.searchTerm.toLowerCase());
90 90 }
91 91 else {
92   - return x.DetArt.toLowerCase().includes(this.searchTerm.toLowerCase()) &&
  92 + return x.DET_LAR.toLowerCase().includes(this.searchTerm.toLowerCase()) &&
93 93 x.categoria_selfservice === this.categoriaActive;
94 94 }
95 95 });
src/app/components/confirmacion-carrito/confirmacion-carrito.component.html
Diff comments   View file @ 8182d5c
... ... @@ -26,8 +26,7 @@
26 26 <i class="fa fa-shopping-cart "></i>
27 27 </p>
28 28 </div>
29   - <div class="col-sm-4 my-auto">
30   - <p class="h3">¿Desea finalizar su compra?</p>
  29 + <div class="col-sm-7 my-auto">
31 30 <p class="h4">Por favor, controle y confirme su compra.</p>
32 31 </div>
33 32 </div>
... ... @@ -42,15 +41,16 @@
42 41 src="{{apiUrl}}/imagenes/{{producto.imagenes[0].imagen}}"
43 42 class="shadow rounded-sm w-100 m-auto">
44 43 <div class="p-2">
45   - <p class="h6 text-left m-0">{{producto.DetArt}}</p>
46   - <div class="row justify-content-between m-0">
47   - <div class="col-12 p-0">
48   - <div class="text-left">
49   - <p class="m-0 h6"><small>{{producto.DET_LAR}}</small></p>
50   - </div>
51   - </div>
  44 + <p class="h6 min-h-55 text-left m-0">
  45 + <small>
  46 + {{producto.DET_LAR}}
  47 + </small>
  48 + </p>
  49 + <div class="row m-0">
52 50 <div class="col-12 my-auto pt-2 pr-2 p-0">
53   - <p class="text-right m-0 h6">{{producto.PreVen | currency}}</p>
  51 + <p class="text-right m-0 h6">
  52 + {{producto.PreVen | currency}}
  53 + </p>
54 54 </div>
55 55 </div>
56 56 </div>
... ... @@ -79,7 +79,7 @@
79 79 <div class="row vh-50 px-2 overflow-scroll m-0">
80 80 <div class="col-12 p-0 mb-2" *ngFor="let producto of productos">
81 81 <p class="h6 m-0 card-text text-left">
82   - <small>{{producto.DetArt}}</small>
  82 + <small>{{producto.DET_LAR}}</small>
83 83 </p>
84 84 <div class="row d-flex justify-content-between m-0">
85 85 <div class="col p-0">
src/app/components/inicio/inicio.component.html
Diff comments   View file @ 8182d5c
... ... @@ -101,7 +101,7 @@
101 101 </div>
102 102 <p class="h5 card-text text-muted font-weight-light">
103 103 Coloque un producto frente<br>
104   - al lector de códigos o selecciónelo en pantalla
  104 + al lector de códigos o selecciónelo en pantalla.
105 105 </p>
106 106 </div>
107 107 <div class="row m-4">
... ... @@ -120,7 +120,7 @@
120 120  
121 121 <div class="row justify-content-between m-3">
122 122 <div class="col-12 text-left px-1">
123   - <p class="h6 font-weight-bold mb-0">{{productoAcargar.DetArt}}</p>
  123 + <p class="h6 font-weight-bold mb-0">{{productoAcargar.DET_LAR}}</p>
124 124 </div>
125 125 <div class="col-12 text-right mt-2">
126 126 <p class="h5 font-weight-bold mb-0">{{productoAcargar.PreVen | currency}}</p>
... ... @@ -136,7 +136,7 @@
136 136  
137 137 <div class="row justify-content-between m-3">
138 138 <div class="col-12 text-left px-1">
139   - <p class="h6 font-weight-bold mb-0">{{promoAcargar.DetArt}}</p>
  139 + <p class="h6 font-weight-bold mb-0">{{promoAcargar.DET_LAR}}</p>
140 140 </div>
141 141 <div class="col-12 text-right mt-2 align-self-end">
142 142 <p class="h5 font-weight-bold mb-0">{{promoAcargar.PreVen | currency}}</p>
... ... @@ -185,7 +185,7 @@
185 185 <p class="h3 card-title">Buscar Productos</p>
186 186 <p class="h5 card-text text-muted font-weight-light">
187 187 Busque aquí los productos<br>
188   - que no tienen código </p>
  188 + que no tienen código.</p>
189 189 </div>
190 190 <div class="col-auto p-0">
191 191 <img src="{{apiUrl}}/imagenes/primario.buscar.png" class="icon-dim mb-2">
src/app/components/pago/pago.component.html
Diff comments   View file @ 8182d5c
... ... @@ -78,7 +78,7 @@
78 78 <div class="row px-2 vh-50 overflow-scroll m-0">
79 79 <div class="col-12 p-0 mb-2" *ngFor="let producto of productos">
80 80 <p class="h6 m-0 card-text text-left">
81   - <small>{{producto.DetArt}}</small>
  81 + <small>{{producto.DET_LAR}}</small>
82 82 </p>
83 83 <div class="row d-flex justify-content-between m-0">
84 84 <div class="col p-0">
src/app/components/popover-sinonimos/popover-sinonimos.component.html
Diff comments   View file @ 8182d5c
... ... @@ -8,45 +8,49 @@
8 8 </div>
9 9 </div>
10 10  
11   - <div class="row m-0 overflow-scroll popover-size pr-2 my-2">
  11 + <div class="row m-0 pr-2 my-2">
12 12 <div class="col">
13 13 <div class="row mb-2" *ngFor="let sinonimo of popoverContent; let i = index">
14   - <div class="col">
  14 + <div class="col p-0">
15 15  
16 16 <div class="row m-0">
17 17 <div class="col text-left">
18 18 <p class="h5 card-title">
19   - Elija una opción - Cantidad Restante {{cantidadRestanteSinonimos[i]}}
  19 + Elija opción - Cantidad Restante {{cantidadRestanteSinonimos[i]}}
20 20 </p>
21 21 </div>
22 22 </div>
23 23  
24   - <div class="row my-3 d-flex justify-content-between" *ngFor="let producto of sinonimo.productos">
25   - <div class="col-7 pl-2 h6 text-right">
26   - <p class="m-0 font-weight-normal">
27   - {{producto.DetArt}}
28   - </p>
29   - </div>
30   - <div class="col-5">
31   - <div class="btn-group float-left my-auto" role="group">
32   - <button
33   - type="button"
34   - class="btn btn-light my-auto border shadow"
35   - (click)="sumarCantidad(producto, i)">
36   - <i class="fa fa-plus" aria-hidden="true"></i>
37   - </button>
38   - <div class="bg-white border border-white px-3 py-1 my-auto text-dark h5">
39   - <small
40   - [ngClass]="{'font-weight-bold': producto.cantidad > 0}">
41   - {{producto.cantidad}}
42   - </small>
  24 + <div class="row m-0 popover-size overflow-scroll">
  25 + <div class="col-12 p-0">
  26 + <div class="row m-0 my-3 d-flex justify-content-between" *ngFor="let producto of sinonimo.productos">
  27 + <div class="col-7 p-0 h6 text-right">
  28 + <p class="m-0 font-weight-normal">
  29 + {{producto.DetArt}}
  30 + </p>
  31 + </div>
  32 + <div class="col-5 pr-0">
  33 + <div class="btn-group float-right my-auto" role="group">
  34 + <button
  35 + type="button"
  36 + class="btn btn-light my-auto border shadow"
  37 + (click)="sumarCantidad(producto, i)">
  38 + <i class="fa fa-plus" aria-hidden="true"></i>
  39 + </button>
  40 + <div class="bg-white border border-white px-3 py-1 my-auto text-dark h5">
  41 + <small
  42 + [ngClass]="{'font-weight-bold': producto.cantidad > 0}">
  43 + {{producto.cantidad}}
  44 + </small>
  45 + </div>
  46 + <button
  47 + type="button"
  48 + class="btn btn-light my-auto border shadow"
  49 + (click)="restarCantidad(producto, i)">
  50 + <i class="fa fa-minus" aria-hidden="true"></i>
  51 + </button>
  52 + </div>
43 53 </div>
44   - <button
45   - type="button"
46   - class="btn btn-light my-auto border shadow"
47   - (click)="restarCantidad(producto, i)">
48   - <i class="fa fa-minus" aria-hidden="true"></i>
49   - </button>
50 54 </div>
51 55 </div>
52 56 </div>
... ... @@ -150,3 +150,11 @@ body {
150 150 top: 65%;
151 151 width: 100%;
152 152 }
  153 +
  154 +.min-h-40 {
  155 + min-height: 40px;
  156 +}
  157 +
  158 +.min-h-55 {
  159 + min-height: 55px;
  160 +}