Marcelo Puebla / autoservicio-axion

Download as
Browse Code »

Commit 07baaf5fbf0bed38a7808d8cd890825097a4afb0

Authored by Marcelo Puebla
2 parents 1ce5394408 e6bf56a76a
Exists in develop

Merge branch 'develop' into 'develop' 

Develop

See merge request !108
Showing 4 changed files   Show diff stats
src/app/modules/comanda/comanda.component.html
Diff comments   View file @ 07baaf5
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 *ngIf="componente.DetArt !== 'Producto ingrediente general'"> 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 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
src/app/modules/pedidos-salientes/pedidos-salientes.component.html
Diff comments   View file @ 07baaf5
1 <div class="row mt-2 justify-content-center h-15"> 1 <div class="row mt-2 justify-content-center h-15">
2 <div class="col-3 col-lg-2"> 2 <div class="col-3 col-lg-2">
3 <img 3 <img
4 draggable="false" 4 draggable="false"
5 ondragstart="return false;" 5 ondragstart="return false;"
6 (contextmenu)="false" 6 (contextmenu)="false"
7 class="w-60 h-auto d-block mx-auto" 7 class="w-60 h-auto d-block mx-auto"
8 src="../../../assets/img/logo-spot.svg"> 8 src="assets/img/logo-spot.svg">
9 </div> 9 </div>
10 </div> 10 </div>
11 <div class="row mt-n5 mx-0 justify-content-around h-75"> 11 <div class="row mt-n5 mx-0 justify-content-around h-75">
12 <div class="col-5 col-md-6 col-lg-4 h-100"> 12 <div class="col-5 col-md-6 col-lg-4 h-100">
13 <div class="p-3 bg-white text-center shadow-lg rounded h-100"> 13 <div class="p-3 bg-white text-center shadow-lg rounded h-100">
14 <h5 class="pt-3">ESTAMOS</h5> 14 <h5 class="pt-3">ESTAMOS</h5>
15 <h3 class="font-weight-bold text-secondary">preparando</h3> 15 <h3 class="font-weight-bold text-secondary">preparando</h3>
16 <h5>TU PEDIDO</h5> 16 <h5>TU PEDIDO</h5>
17 <div 17 <div
18 *ngFor="let pedido of pedidosPendientes; let i = index" 18 *ngFor="let pedido of pedidosPendientes; let i = index"
19 [hidden]="i > 3" 19 [hidden]="i > 3"
20 class="font-weight-bold mb-2 text-muted"> 20 class="font-weight-bold mb-2 text-muted">
21 <h1 class="display-4">{{rellenar(pedido.id.toString().slice(0), 3)}}</h1> 21 <h1 class="display-4">{{rellenar(pedido.id.toString().slice(0), 3)}}</h1>
22 </div> 22 </div>
23 </div> 23 </div>
24 </div> 24 </div>
25 <div class="col-5 col-md-6 col-lg-4 h-100"> 25 <div class="col-5 col-md-6 col-lg-4 h-100">
26 <div class="p-3 bg-white shadow-lg rounded text-center h-100"> 26 <div class="p-3 bg-white shadow-lg rounded text-center h-100">
27 <h5 class="pt-3">LISTO PARA</h5> 27 <h5 class="pt-3">LISTO PARA</h5>
28 <h3 class="font-weight-bold text-primary">retirar</h3> 28 <h3 class="font-weight-bold text-primary">retirar</h3>
29 <div *ngIf="pedidoFinalizado.length"> 29 <div *ngIf="pedidoFinalizado.length">
30 <h1 class="display-1 mt-4 text-primary mb-0">{{rellenar(pedidoFinalizado[0].id.toString().slice(0), 3)}}</h1> 30 <h1 class="display-1 mt-4 text-primary mb-0">{{rellenar(pedidoFinalizado[0].id.toString().slice(0), 3)}}</h1>
31 <hr class="line mt-0"> 31 <hr class="line mt-0">
32 </div> 32 </div>
33 <h3 class="font-weight-bold text-info mt-4">¡Que lo disfrutes!</h3> 33 <h3 class="font-weight-bold text-info mt-4">¡Que lo disfrutes!</h3>
34 </div> 34 </div>
35 </div> 35 </div>
36 </div> 36 </div>
37 37
src/app/shared/cancelar-compra/cancelar-compra.component.html
Diff comments   View file @ 07baaf5
1 <div class="row justify-content-center mt-2 h-15"> 1 <div class="row justify-content-center mt-2 h-15">
2 <img class="h-100 w-auto my-auto" src="../../../assets/img/logo-spot.svg"> 2 <img class="h-100 w-auto my-auto" src="assets/img/logo-spot.svg">
3 </div> 3 </div>
4 <div class="row mx-auto h-70"> 4 <div class="row mx-auto h-70">
5 <div class="col-12 align-self-center"> 5 <div class="col-12 align-self-center">
6 <div class="row mt-5 mx-0 justify-content-around"> 6 <div class="row mt-5 mx-0 justify-content-around">
7 <div class="col-12 col-sm-8 col-md-6 col-lg-4"> 7 <div class="col-12 col-sm-8 col-md-6 col-lg-4">
8 <div class="p-3 bg-white text-center shadow-lg rounded"> 8 <div class="p-3 bg-white text-center shadow-lg rounded">
9 <p class="mt-4 h4">NECESITÁS</p> 9 <p class="mt-4 h4">NECESITÁS</p>
10 <p class="font-weight-bold text-secondary my-4 h2">más tiempo</p> 10 <p class="font-weight-bold text-secondary my-4 h2">más tiempo</p>
11 <p class="mb-4 h4">PARA TU PEDIDO?</p> 11 <p class="mb-4 h4">PARA TU PEDIDO?</p>
12 </div> 12 </div>
13 </div> 13 </div>
14 </div> 14 </div>
15 <!-- BUTTONS --> 15 <!-- BUTTONS -->
16 <div class="row mx-0 mt-5 justify-content-center"> 16 <div class="row mx-0 mt-5 justify-content-center">
17 <div class="col-auto px-0 align-self-start"> 17 <div class="col-auto px-0 align-self-start">
18 <div 18 <div
19 class="row mx-0 py-1 btn-effect bg-primary badge-pill" 19 class="row mx-0 py-1 btn-effect bg-primary badge-pill"
20 (click)="volverPreviousPage()"> 20 (click)="volverPreviousPage()">
21 <div class="col-auto align-self-center text-white">continuar compra</div> 21 <div class="col-auto align-self-center text-white">continuar compra</div>
22 <div class="col-auto align-self-center p-0"> 22 <div class="col-auto align-self-center p-0">
23 <img 23 <img
24 draggable="false" 24 draggable="false"
25 ondragstart="return false;" 25 ondragstart="return false;"
26 (contextmenu)="false" 26 (contextmenu)="false"
27 class="p-1 icon-30" 27 class="p-1 icon-30"
28 src="assets/img/ir.svg"> 28 src="assets/img/ir.svg">
29 </div> 29 </div>
30 </div> 30 </div>
31 </div> 31 </div>
32 </div> 32 </div>
33 <div class="row mx-0 mt-4 justify-content-center"> 33 <div class="row mx-0 mt-4 justify-content-center">
34 <div class="col-auto px-0 align-self-start"> 34 <div class="col-auto px-0 align-self-start">
35 <div 35 <div
36 class="row mx-0 py-1 btn-effect bg-grey badge-pill" 36 class="row mx-0 py-1 btn-effect bg-grey badge-pill"
37 (click)="limpiarCarritoYvolver()"> 37 (click)="limpiarCarritoYvolver()">
38 <div class="col-auto align-self-center">cancelar compra</div> 38 <div class="col-auto align-self-center">cancelar compra</div>
39 <div class="col-auto align-self-center p-0"> 39 <div class="col-auto align-self-center p-0">
40 <img 40 <img
41 draggable="false" 41 draggable="false"
42 ondragstart="return false;" 42 ondragstart="return false;"
43 (contextmenu)="false" 43 (contextmenu)="false"
44 class="p-1 icon-30" 44 class="p-1 icon-30"
45 src="assets/img/icono-cancelar-color.svg"> 45 src="assets/img/icono-cancelar-color.svg">
46 </div> 46 </div>
47 </div> 47 </div>
48 </div> 48 </div>
49 </div> 49 </div>
50 </div> 50 </div>
51 </div> 51 </div>
52 52
src/app/shared/error-forma-pago/error-forma-pago.component.html
Diff comments   View file @ 07baaf5
1 <div class="bg-primary text-center rounded"> 1 <div class="bg-primary text-center rounded">
2 <div class="modal-body"> 2 <div class="modal-body">
3 <img 3 <p class="h1 text-white text-center mx-3">Algo salió mal, intentalo de nuevo o</p>
4 draggable="false"
5 ondragstart="return false;"
6 (contextmenu)="false"
7 class="d-block mx-auto icon-50"
8 src="assets/img/x-amarilla.svg">
9 <p class="h1 text-white text-center mx-3 mt-3">Algo salió mal, intentalo de nuevo o</p>
10 <p class="h1 text-white text-center mx-3 mb-3">probá con otra forma de pago</p> 4 <p class="h1 text-white text-center mx-3 mb-3">probá con otra forma de pago</p>
11 <div 5 <div
12 class="d-inline-block py-1 btn-effect bg-white badge-pill" 6 class="d-inline-block py-1 btn-effect bg-white badge-pill"
13 (click)="continuar()"> 7 (click)="continuar()">
14 CONTINUAR 8 CONTINUAR
15 <img 9 <img
16 draggable="false" 10 draggable="false"
17 ondragstart="return false;" 11 ondragstart="return false;"
18 (contextmenu)="false" 12 (contextmenu)="false"
19 class="icon-30" 13 class="icon-30"
20 src="assets/img/ir-color.svg"> 14 src="assets/img/ir-color.svg">
21 </div> 15 </div>
22 </div> 16 </div>
23 </div> 17 </div>
24 18