Commit 8419ccd73b4dd650aef3e84aae674ba7f6271482
1 parent
bfa03f1dcf
Exists in
develop
Fix
Mostrando mkt desc en comanda
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
src/app/modules/comanda/comanda.component.html
| 1 | <div class="container-fluid d-flex flex-column h-100 fade-in pb-4 pr-2"> | 1 | <div class="container-fluid d-flex flex-column h-100 fade-in pb-4 pr-2"> |
| 2 | <div class="row pt-5 mt-n5"> | 2 | <div class="row pt-5 mt-n5"> |
| 3 | <div class="col-12"> | 3 | <div class="col-12"> |
| 4 | <p class="mb-3 h2 text-center mt-2">Pedidos a elaborar</p> | 4 | <p class="mb-3 h2 text-center mt-2">Pedidos a elaborar</p> |
| 5 | </div> | 5 | </div> |
| 6 | </div> | 6 | </div> |
| 7 | <div class="row flex-fill m-0 scroll-y"> | 7 | <div class="row flex-fill m-0 scroll-y"> |
| 8 | <div class="col-12 px-2"> | 8 | <div class="col-12 px-2"> |
| 9 | <div class="card-columns h-100 m-1 fade-in disable-user-select"> | 9 | <div class="card-columns h-100 m-1 fade-in disable-user-select"> |
| 10 | <div | 10 | <div |
| 11 | *ngFor="let comanda of comandas" | 11 | *ngFor="let comanda of comandas" |
| 12 | class="card fade-in rounded-xs shadow-sm mt-2" | 12 | class="card fade-in rounded-xs shadow-sm mt-2" |
| 13 | [ngClass]="{ | 13 | [ngClass]="{ |
| 14 | 'bg-light': comanda.estado === 1, | 14 | 'bg-light': comanda.estado === 1, |
| 15 | 'bg-danger': comanda.estado === 2, | 15 | 'bg-danger': comanda.estado === 2, |
| 16 | 'bg-success swing-out-top-bck': comanda.estado === 3 | 16 | 'bg-success swing-out-top-bck': comanda.estado === 3 |
| 17 | }"> | 17 | }"> |
| 18 | <div class="card-body p-2"> | 18 | <div class="card-body p-2"> |
| 19 | <div class="row justify-content-between"> | 19 | <div class="row justify-content-between"> |
| 20 | <img | 20 | <img |
| 21 | src="assets/img/para-llevar-fondo-sombra.png" | 21 | src="assets/img/para-llevar-fondo-sombra.png" |
| 22 | class="w-25 h-25 float-left ml-0 mt-n3" | 22 | class="w-25 h-25 float-left ml-0 mt-n3" |
| 23 | *ngIf="comanda.paraLlevar == true"> | 23 | *ngIf="comanda.paraLlevar == true"> |
| 24 | <div></div> | 24 | <div></div> |
| 25 | <!-- NUMERO DE PEDIDO --> | 25 | <!-- NUMERO DE PEDIDO --> |
| 26 | <p class="h1 text-right mr-3"> | 26 | <p class="h1 text-right mr-3"> |
| 27 | {{rellenar(comanda.id.toString().slice(0), 3)}} | 27 | {{rellenar(comanda.id.toString().slice(0), 3)}} |
| 28 | </p> | 28 | </p> |
| 29 | </div> | 29 | </div> |
| 30 | <div> | 30 | <div> |
| 31 | <!-- PEDIDO A NOMBRE DE --> | 31 | <!-- PEDIDO A NOMBRE DE --> |
| 32 | <p class="text-center m-0"> | 32 | <p class="text-center m-0"> |
| 33 | {{comanda.pedidoAnombreDe ? comanda.pedidoAnombreDe.toUpperCase() : ''}} | 33 | {{comanda.pedidoAnombreDe ? comanda.pedidoAnombreDe.toUpperCase() : ''}} |
| 34 | </p> | 34 | </p> |
| 35 | <!-- TIMER PEDIDO --> | 35 | <!-- TIMER PEDIDO --> |
| 36 | <div class="d-flex justify-content-between align-items-center mt-2"> | 36 | <div class="d-flex justify-content-between align-items-center mt-2"> |
| 37 | <p><i class="fas fa-user-clock text-info"></i></p> | 37 | <p><i class="fas fa-user-clock text-info"></i></p> |
| 38 | <p class="text-center mb-1"> | 38 | <p class="text-center mb-1"> |
| 39 | {{comanda.hoursPedido}}:{{comanda.minutesPedido}}:{{comanda.secondsPedido}} | 39 | {{comanda.hoursPedido}}:{{comanda.minutesPedido}}:{{comanda.secondsPedido}} |
| 40 | </p> | 40 | </p> |
| 41 | <p><i class="far fa-clock fa-spin text-info"></i></p> | 41 | <p><i class="far fa-clock fa-spin text-info"></i></p> |
| 42 | </div> | 42 | </div> |
| 43 | <div *ngFor="let detalle of comanda.detalles"> | 43 | <div *ngFor="let detalle of comanda.detalles"> |
| 44 | <div | 44 | <div |
| 45 | class="card-text border-top pt-2 mb-2" | 45 | class="card-text border-top pt-2 mb-2" |
| 46 | [ngClass]=" | 46 | [ngClass]=" |
| 47 | { | 47 | { |
| 48 | 'border-secondary': comanda.estado === 1, | 48 | 'border-secondary': comanda.estado === 1, |
| 49 | 'border-light': comanda.estado != 1 | 49 | 'border-light': comanda.estado != 1 |
| 50 | }"> | 50 | }"> |
| 51 | <!-- DETALLE Y CANTIDAD --> | 51 | <!-- DETALLE Y CANTIDAD --> |
| 52 | <p> | 52 | <p> |
| 53 | <small>{{detalle.MktDesc ? detalle.MktDesc.toUpperCase() : detalle.DetLar.toUpperCase()}}</small><br> | 53 | <small>{{detalle.MktDesc ? detalle.MktDesc.toUpperCase() : detalle.DetLar.toUpperCase()}}</small><br> |
| 54 | <small>CANT.{{detalle.cantidad}}</small> | 54 | <small>CANT.{{detalle.cantidad}}</small> |
| 55 | </p> | 55 | </p> |
| 56 | <div *ngFor="let componente of detalle.componentes"> | 56 | <div *ngFor="let componente of detalle.componentes"> |
| 57 | <p *ngIf="componente.DetArt !== 'Producto ingrediente general'"> | 57 | <p *ngIf="componente.DetArt !== 'Producto ingrediente general'"> |
| 58 | <small>{{componente.DetArt.toLowerCase()}}</small> | 58 | <small>{{componente.MktDesc ? componente.MktDesc.toLowerCase() : componente.DetArt.toLowerCase()}}</small> |
| 59 | </p> | 59 | </p> |
| 60 | </div> | 60 | </div> |
| 61 | </div> | 61 | </div> |
| 62 | <blockquote | 62 | <blockquote |
| 63 | *ngIf="detalle.comentario"> | 63 | *ngIf="detalle.comentario"> |
| 64 | <p class="text-muted font-italic px-4" *ngIf="comanda.estado === 1"><small>{{detalle.comentario}}</small></p> | 64 | <p class="text-muted font-italic px-4" *ngIf="comanda.estado === 1"><small>{{detalle.comentario}}</small></p> |
| 65 | <p class="text-white font-italic px-4" *ngIf="comanda.estado !== 1"><small>{{detalle.comentario}}</small></p> | 65 | <p class="text-white font-italic px-4" *ngIf="comanda.estado !== 1"><small>{{detalle.comentario}}</small></p> |
| 66 | </blockquote> | 66 | </blockquote> |
| 67 | </div> | 67 | </div> |
| 68 | <!-- BOTONES --> | 68 | <!-- BOTONES --> |
| 69 | <button | 69 | <button |
| 70 | *ngIf="comanda.estado === 1" | 70 | *ngIf="comanda.estado === 1" |
| 71 | class="btn btn-block btn-primary shadow-sm btn-elaborar" | 71 | class="btn btn-block btn-primary shadow-sm btn-elaborar" |
| 72 | (click)="updateComanda(comanda, 2, 'En elaboracion')"> | 72 | (click)="updateComanda(comanda, 2, 'En elaboracion')"> |
| 73 | <div class="row justify-content-between"> | 73 | <div class="row justify-content-between"> |
| 74 | <div></div> | 74 | <div></div> |
| 75 | <p class="ml-4 text-white">Elaborar</p> | 75 | <p class="ml-4 text-white">Elaborar</p> |
| 76 | <img | 76 | <img |
| 77 | draggable="false" | 77 | draggable="false" |
| 78 | ondragstart="return false;" | 78 | ondragstart="return false;" |
| 79 | (contextmenu)="false" | 79 | (contextmenu)="false" |
| 80 | class="icon-30 mr-2" | 80 | class="icon-30 mr-2" |
| 81 | src="assets/img/ir.svg"> | 81 | src="assets/img/ir.svg"> |
| 82 | </div> | 82 | </div> |
| 83 | </button> | 83 | </button> |
| 84 | <button | 84 | <button |
| 85 | *ngIf="comanda.estado === 2" | 85 | *ngIf="comanda.estado === 2" |
| 86 | class="btn btn-block shadow-sm btn-terminar" | 86 | class="btn btn-block shadow-sm btn-terminar" |
| 87 | (click)="updateComanda(comanda, 3, 'Terminado')"> | 87 | (click)="updateComanda(comanda, 3, 'Terminado')"> |
| 88 | <div class="row justify-content-between"> | 88 | <div class="row justify-content-between"> |
| 89 | <div></div> | 89 | <div></div> |
| 90 | <p class="ml-4">Terminar</p> | 90 | <p class="ml-4">Terminar</p> |
| 91 | <img | 91 | <img |
| 92 | draggable="false" | 92 | draggable="false" |
| 93 | ondragstart="return false;" | 93 | ondragstart="return false;" |
| 94 | (contextmenu)="false" | 94 | (contextmenu)="false" |
| 95 | class="icon-30 mr-2" | 95 | class="icon-30 mr-2" |
| 96 | src="assets/img/flecha-borde-color.svg"> | 96 | src="assets/img/flecha-borde-color.svg"> |
| 97 | </div> | 97 | </div> |
| 98 | </button> | 98 | </button> |
| 99 | <button | 99 | <button |
| 100 | *ngIf="comanda.estado === 2" | 100 | *ngIf="comanda.estado === 2" |
| 101 | class="btn btn-block btn-deshacer btn-sm shadow-sm p-0" | 101 | class="btn btn-block btn-deshacer btn-sm shadow-sm p-0" |
| 102 | (click)="updateComanda(comanda, 1, 'Pagado')"> | 102 | (click)="updateComanda(comanda, 1, 'Pagado')"> |
| 103 | <div class="row justify-content-between"> | 103 | <div class="row justify-content-between"> |
| 104 | <div></div> | 104 | <div></div> |
| 105 | <span class="h6 ml-4 pt-1"><small>Deshacer</small></span> | 105 | <span class="h6 ml-4 pt-1"><small>Deshacer</small></span> |
| 106 | <i class="fas fa-undo-alt text-info mr-4 my-auto"></i> | 106 | <i class="fas fa-undo-alt text-info mr-4 my-auto"></i> |
| 107 | </div> | 107 | </div> |
| 108 | </button> | 108 | </button> |
| 109 | </div> | 109 | </div> |
| 110 | <!-- TIMER DE ELABORACION --> | 110 | <!-- TIMER DE ELABORACION --> |
| 111 | <div *ngIf="comanda.estado === 2" class="d-flex justify-content-between align-items-center mt-2"> | 111 | <div *ngIf="comanda.estado === 2" class="d-flex justify-content-between align-items-center mt-2"> |
| 112 | <div *ngIf="comanda.estado !== 1"> | 112 | <div *ngIf="comanda.estado !== 1"> |
| 113 | <i class="fa fa-utensils text-info" aria-hidden="true"></i> | 113 | <i class="fa fa-utensils text-info" aria-hidden="true"></i> |
| 114 | </div> | 114 | </div> |
| 115 | <span *ngIf="comanda.estado === 1" class="text-dark"> | 115 | <span *ngIf="comanda.estado === 1" class="text-dark"> |
| 116 | {{comanda.hoursElaboracion}}:{{comanda.minutesElaboracion}}:{{comanda.secondsElaboracion}} | 116 | {{comanda.hoursElaboracion}}:{{comanda.minutesElaboracion}}:{{comanda.secondsElaboracion}} |
| 117 | </span> | 117 | </span> |
| 118 | <span *ngIf="comanda.estado !== 1" class="text-white"> | 118 | <span *ngIf="comanda.estado !== 1" class="text-white"> |
| 119 | {{comanda.hoursElaboracion}}:{{comanda.minutesElaboracion}}:{{comanda.secondsElaboracion}} | 119 | {{comanda.hoursElaboracion}}:{{comanda.minutesElaboracion}}:{{comanda.secondsElaboracion}} |
| 120 | </span> | 120 | </span> |
| 121 | <i class="fas fa-clock fa-spin text-info"></i> | 121 | <i class="fas fa-clock fa-spin text-info"></i> |
| 122 | </div> | 122 | </div> |
| 123 | </div> | 123 | </div> |
| 124 | </div> | 124 | </div> |
| 125 | </div> | 125 | </div> |
| 126 | </div> | 126 | </div> |
| 127 | </div> | 127 | </div> |
| 128 | </div> | 128 | </div> |
| 129 | 129 |