Commit 9d4962bfe6e9c32bbf176ef9fa5b4c48a93cc36c
Exists in
develop
Merge branch 'master' into 'develop'
Master(benjamin) See merge request !62
Showing
3 changed files
Show diff stats
src/app/modules/comanda/comanda.component.html
| ... | ... | @@ -54,7 +54,7 @@ |
| 54 | 54 | <small>CANT.{{detalle.cantidad}}</small> |
| 55 | 55 | </p> |
| 56 | 56 | <div *ngFor="let componente of detalle.componentes"> |
| 57 | - <p> | |
| 57 | + <p *ngIf="componente.DetArt !== 'Producto ingrediente general'"> | |
| 58 | 58 | <small>{{componente.DetArt.toUpperCase()}}</small> |
| 59 | 59 | </p> |
| 60 | 60 | </div> |
| ... | ... | @@ -102,7 +102,7 @@ |
| 102 | 102 | (click)="updateComanda(comanda, 1, 'Pagado')"> |
| 103 | 103 | <div class="row justify-content-between"> |
| 104 | 104 | <div></div> |
| 105 | - <span class="h6 ml-4"><small>Deshacer</small></span> | |
| 105 | + <span class="h6 ml-4 pt-1"><small>Deshacer</small></span> | |
| 106 | 106 | <i class="fas fa-undo-alt text-info mr-4 my-auto"></i> |
| 107 | 107 | </div> |
| 108 | 108 | </button> |
src/app/modules/info-formas-pago/info-formas-pago.component.html
src/app/modules/opcion-pedido/opcion-pedido.component.html
| ... | ... | @@ -29,16 +29,16 @@ |
| 29 | 29 | draggable="false" |
| 30 | 30 | ondragstart="return false;" |
| 31 | 31 | (contextmenu)="false" |
| 32 | - class="pt-3 icon-50" | |
| 32 | + class="pt-2 icon-60" | |
| 33 | 33 | src="assets/img/icono-plato.svg"> |
| 34 | 34 | </div> |
| 35 | - <div class="col-8 align-self-center text-center text-white">comer acá</div> | |
| 35 | + <div class="col-8 align-self-center text-center text-white h3">comer acá</div> | |
| 36 | 36 | <div class="col-2 align-self-center p-0"> |
| 37 | 37 | <img |
| 38 | 38 | draggable="false" |
| 39 | 39 | ondragstart="return false;" |
| 40 | 40 | (contextmenu)="false" |
| 41 | - class="p-1 icon-30" | |
| 41 | + class="p-1 icon-50" | |
| 42 | 42 | src="assets/img/ir.svg"> |
| 43 | 43 | </div> |
| 44 | 44 | </div> |
| ... | ... | @@ -60,16 +60,16 @@ |
| 60 | 60 | draggable="false" |
| 61 | 61 | ondragstart="return false;" |
| 62 | 62 | (contextmenu)="false" |
| 63 | - class="pt-3 icon-50" | |
| 63 | + class="pt-2 icon-60" | |
| 64 | 64 | src="assets/img/icono-take-away.svg"> |
| 65 | 65 | </div> |
| 66 | - <div class="col-8 align-self-center text-center text-white">para llevar</div> | |
| 66 | + <div class="col-8 align-self-center text-center text-white h3">para llevar</div> | |
| 67 | 67 | <div class="col-2 align-self-center p-0"> |
| 68 | 68 | <img |
| 69 | 69 | draggable="false" |
| 70 | 70 | ondragstart="return false;" |
| 71 | 71 | (contextmenu)="false" |
| 72 | - class="p-1 icon-30" | |
| 72 | + class="p-1 icon-50" | |
| 73 | 73 | src="assets/img/ir.svg"> |
| 74 | 74 | </div> |
| 75 | 75 | </div> |