Commit df2615f81cce3c453a9a0ee2f7ac868068c04232
Exists in
develop
Merge branch 'develop' of http://git.focasoftware.com/angular/autoservicio-axion into develop
Bajando version actual
Showing
5 changed files
Show diff stats
src/app/interfaces/IComanda.ts
src/app/modules/comanda/comanda.component.html
... | ... | @@ -50,7 +50,7 @@ |
50 | 50 | }"> |
51 | 51 | <!-- DETALLE Y CANTIDAD --> |
52 | 52 | <p> |
53 | - <small>{{detalle.MKT_DESC ? detalle.MKT_DESC.toUpperCase() : detalle.DetLar.toUpperCase()}}</small><br> | |
53 | + <small>{{detalle.MktDesc ? detalle.MktDesc.toUpperCase() : detalle.DetLar.toUpperCase()}}</small><br> | |
54 | 54 | <small>CANT.{{detalle.cantidad}}</small> |
55 | 55 | </p> |
56 | 56 | <div *ngFor="let componente of detalle.componentes"> |
src/app/modules/pedidos-salientes/pedidos-salientes.component.html
1 | -<div class="row mx-0 mt-5 justify-content-around"> | |
2 | - <div class="col"> | |
1 | +<div class="row mx-0 py-5 px-2 h-100 justify-content-around"> | |
2 | + <div class="col-4"> | |
3 | 3 | <div class="p-3 bg-white text-center shadow-lg rounded h-100"> |
4 | 4 | <p class="h5 mt-3">ESTAMOS</p> |
5 | 5 | <p class="h3 font-weight-bold text-secondary">preparando</p> |
... | ... | @@ -12,7 +12,7 @@ |
12 | 12 | </div> |
13 | 13 | </div> |
14 | 14 | </div> |
15 | - <div class="col"> | |
15 | + <div class="col-4"> | |
16 | 16 | <img |
17 | 17 | draggable="false" |
18 | 18 | ondragstart="return false;" |
... | ... | @@ -28,7 +28,7 @@ |
28 | 28 | <p class="h3 font-weight-bold text-info mt-2">¡Que lo disfrutes!</p> |
29 | 29 | </div> |
30 | 30 | </div> |
31 | - <div class="col"> | |
31 | + <div class="col-4"> | |
32 | 32 | <div class="p-3 bg-white text-center shadow-lg rounded h-100"> |
33 | 33 | <p class="h5 mt-3">YA FUÉ</p> |
34 | 34 | <p class="h3 font-weight-bold text-primary">entregado</p> |
src/app/shared/sinonimo/sinonimo.component.ts
... | ... | @@ -45,7 +45,7 @@ export class SinonimoComponent implements OnInit { |
45 | 45 | } |
46 | 46 | |
47 | 47 | validateNext() { |
48 | - const sinonimo = this.sinonimos[this.currentIndex] | |
48 | + const sinonimo = this.sinonimos[this.currentIndex]; | |
49 | 49 | sinonimo.selected = (sinonimo.cantidadRestante > 0) ? false : true; |
50 | 50 | return !sinonimo.selected ? 'disabled' : 'btn-effect'; |
51 | 51 | } |