Luis Suarez / autoservicio-axion

Download as
Browse Code »

Commit 9d4962bfe6e9c32bbf176ef9fa5b4c48a93cc36c

Authored by Marcelo Puebla
2 parents 50ca3debe0 08c32ce4d8
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
Diff comments   View file @ 9d4962b
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.DetLar}}</small><br> 53 <small>{{detalle.DetLar}}</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> 57 <p *ngIf="componente.DetArt !== 'Producto ingrediente general'">
58 <small>{{componente.DetArt.toUpperCase()}}</small> 58 <small>{{componente.DetArt.toUpperCase()}}</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" style="color: #fff;">Elaborar</p> 75 <p class="ml-4" style="color: #fff;">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"><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
src/app/modules/info-formas-pago/info-formas-pago.component.html
Diff comments   View file @ 9d4962b
1 <div class="h-92 bg-white fade-in-left"> 1 <div class="h-92 bg-white fade-in-left">
2 <div class="row mx-0 h-15"> 2 <div class="row mx-0 h-15">
3 <div class="col-12 px-0 h-80 my-auto"> 3 <div class="col-12 px-0 h-80 my-auto">
4 <img 4 <img
5 draggable="false" 5 draggable="false"
6 ondragstart="return false;" 6 ondragstart="return false;"
7 (contextmenu)="false" 7 (contextmenu)="false"
8 class="d-block mx-auto h-100" 8 class="d-block mx-auto h-100"
9 src="assets/img/logo-spot.svg"> 9 src="assets/img/logo-spot.svg">
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="h-85"> 12 <div class="h-85">
13 <div class="row h-auto mt-6 mx-0 justify-content-center text-center"> 13 <div class="row h-auto mt-6 mx-0 justify-content-center text-center">
14 <div 14 <div
15 [routerLink]="['/opcion-pedido']" 15 [routerLink]="['/opcion-pedido']"
16 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto 16 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto
17 btn-effect align-self-end border border-secondary rounded reduce-card-1"> 17 btn-effect align-self-end border border-secondary rounded reduce-card-1">
18 <img 18 <img
19 draggable="false" 19 draggable="false"
20 ondragstart="return false;" 20 ondragstart="return false;"
21 (contextmenu)="false" 21 (contextmenu)="false"
22 class="img-in-top px-4 bg-white" 22 class="img-in-top px-4 bg-white"
23 src="assets/img/icono-tarjetas.svg"> 23 src="assets/img/icono-tarjetas.svg">
24 <p class="h6 m-0">ESTA TERMINAL OPERA CON</p> 24 <p class="h6 m-0">ESTA TERMINAL OPERA CON</p>
25 <p class="h2 mb-3 text-secondary"> 25 <p class="h2 mb-3 text-secondary">
26 tarjetas y 26 tarjetas y
27 <img 27 <img
28 draggable="false" 28 draggable="false"
29 ondragstart="return false;" 29 ondragstart="return false;"
30 (contextmenu)="false" 30 (contextmenu)="false"
31 class="icon-150" 31 class="icon-150"
32 src="assets/img/icono-mercado-pago.svg"> 32 src="assets/img/icono-mercado-pago.svg">
33 </p> 33 </p>
34 <div class="d-inline-block py-1 btn-effect bg-secondary badge-pill text-white"> 34 <div class="d-inline-block py-1 btn-effect bg-secondary badge-pill text-white">
35 CONTINUAR 35 CONTINUAR
36 <img 36 <img
37 draggable="false" 37 draggable="false"
38 ondragstart="return false;" 38 ondragstart="return false;"
39 (contextmenu)="false" 39 (contextmenu)="false"
40 class="icon-30" 40 class="icon-30"
41 src="assets/img/ir.svg"> 41 src="assets/img/ir.svg">
42 </div> 42 </div>
43 </div> 43 </div>
44 <div 44 <div
45 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center 45 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center
46 btn-effect border border-primary rounded reduce-card-2" 46 btn-effect border border-primary rounded reduce-card-2"
47 (click)="openGoCaja(templateGoCaja)"> 47 (click)="openGoCaja(templateGoCaja)">
48 <img 48 <img
49 draggable="false" 49 draggable="false"
50 ondragstart="return false;" 50 ondragstart="return false;"
51 (contextmenu)="false" 51 (contextmenu)="false"
52 class="img-in-top px-4 bg-white" 52 class="img-in-top px-4 bg-white"
53 src="assets/img/icono-efectivo.svg"> 53 src="assets/img/icono-efectivo.svg">
54 <p class="h6 m-0">SI PREFERIS PAGAR EN EFECTIVO</p> 54 <p class="h6 m-0">SI PREFERIS PAGAR EN EFECTIVO</p>
55 <p class="h2 m-0 text-primary">haga su pedido<br>en caja</p> 55 <p class="h2 m-0 text-primary">haga su pedido<br>en caja</p>
56 </div> 56 </div>
57 </div> 57 </div>
58 </div> 58 </div>
59 </div> 59 </div>
60 60
61 <ng-template #templateGoCaja> 61 <ng-template #templateGoCaja>
62 <div class="bg-primary rounded shadow text-white"> 62 <div class="bg-primary rounded shadow text-white">
63 <div class="modal-body text-center"> 63 <div class="modal-body text-center">
64 Por favor, hace tu pedido en la caja. 64 Por favor, hacé tu pedido en la caja.
65 </div> 65 </div>
66 </div> 66 </div>
67 </ng-template> 67 </ng-template>
68 68
src/app/modules/opcion-pedido/opcion-pedido.component.html
Diff comments   View file @ 9d4962b
1 <div class="h-92 bg-white fade-in-left"> 1 <div class="h-92 bg-white fade-in-left">
2 <div class="row mx-0 h-20"> 2 <div class="row mx-0 h-20">
3 <div class="col-12 px-0 h-80 my-auto"> 3 <div class="col-12 px-0 h-80 my-auto">
4 <img 4 <img
5 draggable="false" 5 draggable="false"
6 ondragstart="return false;" 6 ondragstart="return false;"
7 (contextmenu)="false" 7 (contextmenu)="false"
8 class="d-block mx-auto h-100" 8 class="d-block mx-auto h-100"
9 src="assets/img/logo-spot.svg"> 9 src="assets/img/logo-spot.svg">
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="h-100"> 12 <div class="h-100">
13 <div class="h-10"></div> 13 <div class="h-10"></div>
14 <div class="row mt-5 mx-3 h-auto"> 14 <div class="row mt-5 mx-3 h-auto">
15 <div class="col-12 px-0 py-2 align-self-center"> 15 <div class="col-12 px-0 py-2 align-self-center">
16 <p class="col-auto h4 text-truncate text-center">TU PEDIDO ES PARA</p> 16 <p class="col-auto h4 text-truncate text-center">TU PEDIDO ES PARA</p>
17 </div> 17 </div>
18 </div> 18 </div>
19 <div class="row mt-5 h-auto justify-content-center mx-0"> 19 <div class="row mt-5 h-auto justify-content-center mx-0">
20 <div class="col-5 px-0 h-auto align-self-start reduce-card-1"> 20 <div class="col-5 px-0 h-auto align-self-start reduce-card-1">
21 <div class="row justify-content-between"> 21 <div class="row justify-content-between">
22 <div class="col-12"> 22 <div class="col-12">
23 <div 23 <div
24 class="btn-effect col-12 px-0 bg-white" 24 class="btn-effect col-12 px-0 bg-white"
25 (click)="goTo('/seleccion-articulos'); seleccionPedido('false')"> 25 (click)="goTo('/seleccion-articulos'); seleccionPedido('false')">
26 <div class="row mx-0 bg-primary badge-pill heigth-80"> 26 <div class="row mx-0 bg-primary badge-pill heigth-80">
27 <div class="col-2 p-0"> 27 <div class="col-2 p-0">
28 <img 28 <img
29 draggable="false" 29 draggable="false"
30 ondragstart="return false;" 30 ondragstart="return false;"
31 (contextmenu)="false" 31 (contextmenu)="false"
32 class="pt-3 icon-50" 32 class="pt-2 icon-60"
33 src="assets/img/icono-plato.svg"> 33 src="assets/img/icono-plato.svg">
34 </div> 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 <div class="col-2 align-self-center p-0"> 36 <div class="col-2 align-self-center p-0">
37 <img 37 <img
38 draggable="false" 38 draggable="false"
39 ondragstart="return false;" 39 ondragstart="return false;"
40 (contextmenu)="false" 40 (contextmenu)="false"
41 class="p-1 icon-30" 41 class="p-1 icon-50"
42 src="assets/img/ir.svg"> 42 src="assets/img/ir.svg">
43 </div> 43 </div>
44 </div> 44 </div>
45 </div> 45 </div>
46 </div> 46 </div>
47 </div> 47 </div>
48 </div> 48 </div>
49 </div> 49 </div>
50 <div class="row mt-5 h-auto justify-content-center mx-0"> 50 <div class="row mt-5 h-auto justify-content-center mx-0">
51 <div class="col-5 px-0 h-auto align-self-start reduce-card-2"> 51 <div class="col-5 px-0 h-auto align-self-start reduce-card-2">
52 <div class="row justify-content-between"> 52 <div class="row justify-content-between">
53 <div class="col-12"> 53 <div class="col-12">
54 <div 54 <div
55 class="btn-effect col-12 align-self-center px-0 bg-white" 55 class="btn-effect col-12 align-self-center px-0 bg-white"
56 (click)="goTo('/seleccion-articulos'); seleccionPedido('true')"> 56 (click)="goTo('/seleccion-articulos'); seleccionPedido('true')">
57 <div class="row mx-0 bg-primary badge-pill heigth-80"> 57 <div class="row mx-0 bg-primary badge-pill heigth-80">
58 <div class="col-2 p-0"> 58 <div class="col-2 p-0">
59 <img 59 <img
60 draggable="false" 60 draggable="false"
61 ondragstart="return false;" 61 ondragstart="return false;"
62 (contextmenu)="false" 62 (contextmenu)="false"
63 class="pt-3 icon-50" 63 class="pt-2 icon-60"
64 src="assets/img/icono-take-away.svg"> 64 src="assets/img/icono-take-away.svg">
65 </div> 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 <div class="col-2 align-self-center p-0"> 67 <div class="col-2 align-self-center p-0">
68 <img 68 <img
69 draggable="false" 69 draggable="false"
70 ondragstart="return false;" 70 ondragstart="return false;"
71 (contextmenu)="false" 71 (contextmenu)="false"
72 class="p-1 icon-30" 72 class="p-1 icon-50"
73 src="assets/img/ir.svg"> 73 src="assets/img/ir.svg">
74 </div> 74 </div>
75 </div> 75 </div>
76 </div> 76 </div>
77 </div> 77 </div>
78 </div> 78 </div>
79 </div> 79 </div>
80 </div> 80 </div>
81 </div> 81 </div>
82 </div> 82 </div>
83 83