Commit 6c4516fb7dc2b1512e8a66b24d2706e950c09262
Exists in
develop
Merge branch 'master' into 'develop'
Master(benjamin) See merge request !60
Showing
3 changed files
Show diff stats
src/app/modules/comanda/comanda.component.html
| ... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 | <p><i class="far fa-clock fa-spin text-info"></i></p> |
| 42 | 42 | </div> |
| 43 | 43 | <div *ngFor="let detalle of comanda.detalles"> |
| 44 | - <p | |
| 44 | + <div | |
| 45 | 45 | class="card-text border-top pt-2 mb-2" |
| 46 | 46 | [ngClass]=" |
| 47 | 47 | { |
| ... | ... | @@ -49,9 +49,16 @@ |
| 49 | 49 | 'border-light': comanda.estado != 1 |
| 50 | 50 | }"> |
| 51 | 51 | <!-- DETALLE Y CANTIDAD --> |
| 52 | - <small>{{detalle.DetLar}}</small><br> | |
| 53 | - <small>CANT.{{detalle.cantidad}}</small> | |
| 54 | - </p> | |
| 52 | + <p> | |
| 53 | + <small>{{detalle.DetLar}}</small><br> | |
| 54 | + <small>CANT.{{detalle.cantidad}}</small> | |
| 55 | + </p> | |
| 56 | + <div *ngFor="let componente of detalle.componentes"> | |
| 57 | + <p> | |
| 58 | + <small>{{componente.DetArt.toUpperCase()}}</small> | |
| 59 | + </p> | |
| 60 | + </div> | |
| 61 | + </div> | |
| 55 | 62 | <blockquote |
| 56 | 63 | *ngIf="detalle.comentario"> |
| 57 | 64 | <p class="text-muted font-italic px-4" *ngIf="comanda.estado === 1"><small>{{detalle.comentario}}</small></p> |
src/app/modules/opcion-pedido/opcion-pedido.component.html
| ... | ... | @@ -23,13 +23,13 @@ |
| 23 | 23 | <div |
| 24 | 24 | class="btn-effect col-12 px-0 bg-white" |
| 25 | 25 | (click)="goTo('/seleccion-articulos'); seleccionPedido('false')"> |
| 26 | - <div class="row mx-0 bg-primary badge-pill"> | |
| 26 | + <div class="row mx-0 bg-primary badge-pill heigth-80"> | |
| 27 | 27 | <div class="col-2 p-0"> |
| 28 | 28 | <img |
| 29 | 29 | draggable="false" |
| 30 | 30 | ondragstart="return false;" |
| 31 | 31 | (contextmenu)="false" |
| 32 | - class="p-1 icon-50" | |
| 32 | + class="pt-3 icon-50" | |
| 33 | 33 | src="assets/img/icono-plato.svg"> |
| 34 | 34 | </div> |
| 35 | 35 | <div class="col-8 align-self-center text-center text-white">comer acá</div> |
| ... | ... | @@ -54,13 +54,13 @@ |
| 54 | 54 | <div |
| 55 | 55 | class="btn-effect col-12 align-self-center px-0 bg-white" |
| 56 | 56 | (click)="goTo('/seleccion-articulos'); seleccionPedido('true')"> |
| 57 | - <div class="row mx-0 bg-primary badge-pill"> | |
| 57 | + <div class="row mx-0 bg-primary badge-pill heigth-80"> | |
| 58 | 58 | <div class="col-2 p-0"> |
| 59 | 59 | <img |
| 60 | 60 | draggable="false" |
| 61 | 61 | ondragstart="return false;" |
| 62 | 62 | (contextmenu)="false" |
| 63 | - class="p-1 icon-50" | |
| 63 | + class="pt-3 icon-50" | |
| 64 | 64 | src="assets/img/icono-take-away.svg"> |
| 65 | 65 | </div> |
| 66 | 66 | <div class="col-8 align-self-center text-center text-white">para llevar</div> |