Martin Macola / autoservicio

Download as
Browse Code »

Commit ac4e3e47dd031bfe1ef2ddec2e9fdd60f2dae6b5

Authored by Eric Fernandez
2 parents 73eb209158 3d2cc674eb
Exists in master

conflicts

Showing 9 changed files   Show diff stats
... ... @@ -37,7 +37,7 @@
37 37 },
38 38 "devDependencies": {
39 39 "@angular-devkit/build-angular": "~0.800.0",
40   - "@angular/cli": "~8.0.0",
  40 + "@angular/cli": "^8.3.2",
41 41 "@angular/compiler-cli": "~8.0.0",
42 42 "@angular/language-service": "~8.0.0",
43 43 "@types/jasmine": "~3.3.8",
src/app/components/comanda/comanda.component.html
Diff comments   View file @ ac4e3e4
1 1 <div class="container-fluid fade-in p-0">
2   - <div class="row m-1 fade-in disable-user-select">
  2 + <div class="card-columns m-1 fade-in disable-user-select">
3 3 <div
4   - [ngClass]="{ 'swing-out-top-bck': comanda.estado === 3 }"
5   - class="col-2 col-1-5 p-1" *ngFor="let comanda of comandas">
6   -
7   - <div
8   - class="card-comanda fade-in d-flex align-items-end flex-column bg-danger rounded-xs shadow-sm border-0 h-100"
9   - [ngClass]="
10   - {
11   - 'bg-light': comanda.estado === 1,
12   - 'bg-danger': comanda.estado === 2,
13   - 'bg-success': comanda.estado === 3
14   - }">
15   - <img
16   - class="card-img-top rounded-xs shadow-sm"
17   - src="{{apiImagenes}}/imagenes/{{comanda.detalles[0].articulo.imagenes[0].imagen}}"/>
18   - <div class="row w-100 m-0 mt-2">
19   - <p class="col-12 px-2 mb-2 m-0 h6">{{comanda.detalles[0].articulo.DetArt}}</p>
20   - <p class="col-12 px-2 mb-2 m-0 h6"><small>{{comanda.detalles[0].articulo.DET_LAR}}</small></p>
21   - </div>
22   - <div class="row w-100 m-0 mb-2 mt-auto">
23   - <div
24   - class="col-12 px-2"
25   - *ngIf="comanda.estado === 1">
26   - <button
27   - class="btn btn-block btn-danger shadow-sm"
28   - (click)="updateComanda(comanda, 2, 'En elaboracion')">
29   - Elaborar
30   - </button>
31   - </div>
32   - <div
33   - class="col-12 px-2"
34   - *ngIf="comanda.estado === 2">
35   - <button
36   - class="btn btn-block btn-success shadow-sm"
37   - (click)="updateComanda(comanda, 3, 'Terminado')">
38   - Terminado
39   - </button>
40   - </div>
41   - </div>
42   - <div
  4 + *ngFor="let comanda of comandas"
  5 + class="card fade-in rounded-xs shadow-sm"
  6 + [ngClass]="{
  7 + 'bg-light': comanda.estado === 1,
  8 + 'bg-danger': comanda.estado === 2,
  9 + 'bg-success swing-out-top-bck': comanda.estado === 3
  10 + }">
  11 + <div class="card-body p-2">
  12 + <p class="h5 card-title text-center mb-1">{{comanda.id}}.</p>
  13 + <p
  14 + *ngFor="let detalle of comanda.detalles"
  15 + [ngClass]="
  16 + {
  17 + 'border-secondary': comanda.estado === 1,
  18 + 'border-light': comanda.estado != 1
  19 + }"
  20 + class="card-text border-top pt-2 mb-2">
  21 + <small>
  22 + {{detalle.articulo.DET_LAR}}
  23 + </small>
  24 + <small
  25 + class="font-weight-bold text-purple"
  26 + *ngIf="detalle.articulo.ELBPRO === '1'">
  27 + (ELABORACIÓN PROPIA)
  28 + </small>
  29 + </p>
  30 + <button
  31 + *ngIf="comanda.estado === 1"
  32 + class="btn btn-block btn-danger shadow-sm"
  33 + (click)="updateComanda(comanda, 2, 'En elaboracion')">
  34 + Elaborar
  35 + </button>
  36 + <button
43 37 *ngIf="comanda.estado === 2"
44   - class="row w-100 mx-0 mb-2">
45   - <div class="col-12 px-2">
46   - <button
47   - class="btn btn-block btn-light btn-sm shadow-sm p-0"
48   - (click)="updateComanda(comanda, 1, 'Pagado')">
49   - <span class="pr-1 h6"><small>En espera</small></span>
50   - <i class="fa fa-undo text-warning" aria-hidden="true"></i>
51   - </button>
52   - </div>
53   - </div>
  38 + class="btn btn-block btn-success shadow-sm"
  39 + (click)="updateComanda(comanda, 3, 'Terminado')">
  40 + Terminado
  41 + </button>
  42 + <button
  43 + *ngIf="comanda.estado === 2"
  44 + class="btn btn-block btn-light btn-sm shadow-sm p-0"
  45 + (click)="updateComanda(comanda, 1, 'Pagado')">
  46 + <span class="pr-1 h6"><small>En espera</small></span>
  47 + <i class="fa fa-undo text-warning" aria-hidden="true"></i>
  48 + </button>
54 49 </div>
55   -
56 50 </div>
57 51 </div>
58 52 </div>
src/app/components/comanda/comanda.component.scss
Diff comments   View file @ ac4e3e4
... ... @@ -9,6 +9,27 @@
9 9 }
10 10 }
11 11  
  12 +@media (min-width: 1200px) {
  13 + .card-columns {
  14 + column-count: 7 !important;
  15 + column-gap: 0.5rem !important;
  16 + }
  17 +}
  18 +
  19 +@media (max-width: 1200px) {
  20 + .card-columns {
  21 + column-count: 6 !important;
  22 + column-gap: 0.5rem !important;
  23 + }
  24 +}
  25 +
  26 +@media (max-width: 768px) {
  27 + .card-columns {
  28 + column-count: 3 !important;
  29 + column-gap: 0.5rem !important;
  30 + }
  31 +}
  32 +
12 33 .bg-danger {
13 34 background-color: #8c000e !important;
14 35 p {
src/app/components/comanda/comanda.component.ts
Diff comments   View file @ ac4e3e4
... ... @@ -11,7 +11,6 @@ import * as _ from &#39;lodash&#39;;
11 11 })
12 12 export class ComandaComponent implements OnInit {
13 13  
14   - private apiImagenes = appSettings.apiImagenes;
15 14 private comandas: Comanda[] = [];
16 15 private cicloTime;
17 16  
... ... @@ -23,7 +22,6 @@ export class ComandaComponent implements OnInit {
23 22  
24 23 this.buscar();
25 24 this.ciclo();
26   -
27 25 }
28 26  
29 27 ngOnDestroy() {
... ... @@ -34,18 +32,20 @@ export class ComandaComponent implements OnInit {
34 32 buscar() {
35 33  
36 34 this.comandaService.getAll()
37   - .subscribe((res: Comanda[]) => {
  35 + .subscribe((res: Comanda[]) => {
38 36  
39   - if (!_.isEqual(res, this.comandas)) {
  37 + if (!_.isEqual(res, this.comandas)) {
40 38  
41   - this.comandas = res;
42   - }
43   - }, e => console.error(e))
  39 + this.comandas = res;
  40 + console.log(this.comandas);
  41 + }
  42 + }, e => console.error(e))
44 43 }
45 44  
46 45 ciclo() {
47 46  
48 47 this.cicloTime = setTimeout(() => {
  48 +
49 49 this.buscar();
50 50 this.ciclo();
51 51 }, 5000);
src/app/components/confirmacion-carrito/confirmacion-carrito.component.html
Diff comments   View file @ ac4e3e4
... ... @@ -163,7 +163,7 @@
163 163 <div class="col-5 my-auto p-0">
164 164 <img
165 165 src="{{apiImagenes}}/imagenes/efectivo.png"
166   - class="w-50 float-right mr-3">
  166 + class="w-100 float-right">
167 167 </div>
168 168 </div>
169 169  
... ... @@ -175,7 +175,7 @@
175 175 <div class="col-5 my-auto p-0">
176 176 <img
177 177 src="{{apiImagenes}}/imagenes/tarjeta.png"
178   - class="w-50 float-right mr-3">
  178 + class="w-100 float-right">
179 179 </div>
180 180 </div>
181 181  
... ... @@ -189,7 +189,7 @@
189 189 <div class="col-5 my-auto p-0">
190 190 <img
191 191 src="{{apiImagenes}}/imagenes/qr.png"
192   - class="w-50 float-right mr-3">
  192 + class="w-100 float-right">
193 193 </div>
194 194 </div>
195 195 </div>
... ... @@ -209,6 +209,11 @@
209 209 </p>
210 210 <p class="font-weight-bold display-4">Recuerde retirar su ticket</p>
211 211 </div>
  212 + <div class="row z-index-0 fixed-top m-0 w-100">
  213 + <div class="col-12 p-3">
  214 + <img class="w-15 float-right" src="../../../assets/img/debo-gray.png">
  215 + </div>
  216 + </div>
212 217 </div>
213 218  
214 219 <div
... ... @@ -216,9 +221,14 @@
216 221 class="row m-0 fade-in bg-primary-gradient disable-user-select vh-100">
217 222 <div class="col-12 text-center text-white my-auto">
218 223 <p class="font-weight-bold display-4">
219   - Retire su ticket<br>
220   - y diríjase a caja para<br>
221   - efectuar el pago.
  224 + Retire su ticket<br>
  225 + y diríjase a caja para<br>
  226 + efectuar el pago.
222 227 </p>
223 228 </div>
  229 + <div class="row z-index-0 fixed-top m-0 w-100">
  230 + <div class="col-12 p-3">
  231 + <img class="w-15 float-right" src="../../../assets/img/debo-gray.png">
  232 + </div>
  233 + </div>
224 234 </div>
src/app/components/inicio/inicio.component.ts
Diff comments   View file @ ac4e3e4
... ... @@ -93,7 +93,7 @@ export class InicioComponent implements OnInit, AfterViewInit {
93 93 confirmarProducto() {
94 94  
95 95 var producto = this.promoAcargar ? this.promoAcargar : this.productoAcargar;
96   - producto.cantidad = 1;
  96 + producto.cantidad = producto.cantidad ? producto.cantidad : 1;
97 97 this.productoService.setProductos(producto);
98 98 this.productoService.productoAcargar = this.promoAcargar = this.productoAcargar = undefined;
99 99 this.productoService.esPromoPersonalizada = false;
src/app/components/pedidos-salientes/pedidos-salientes.component.html
Diff comments   View file @ ac4e3e4
1   -<div class="bg-primary-gradient vh-100">
  1 +<div class="bg-primary-gradient vh-100 disable-user-select">
2 2 <div class="d-flex justify-content-center">
  3 + <div class="row z-index-0 fixed-top m-0 w-100">
  4 + <div class="col-12 p-3">
  5 + <img class="w-15 float-right" src="../../../assets/img/debo-gray.png">
  6 + </div>
  7 + </div>
3 8 <div class="row m-5 text-white text-center">
4 9  
5 10 <div class="col-12 p-0">
src/assets/img/debo-gray.png
Diff comments   View file @ ac4e3e4

22.3 KB
... ... @@ -4,7 +4,12 @@
4 4  
5 5 html,
6 6 body {
7   - background-color: #f0f0f0;
  7 + height: 100%;
  8 + background: linear-gradient(
  9 + 0deg,
  10 + #e6e6e6,
  11 + #fff
  12 + );
8 13 font-family: bahnschrift;
9 14 overflow: hidden !important;
10 15 }
... ... @@ -53,7 +58,7 @@ body {
53 58 overflow-y: auto !important;
54 59 overflow-x: hidden !important;
55 60 &::-webkit-scrollbar {
56   - width: .75em;
  61 + width: 0.75em;
57 62 }
58 63 &::-webkit-scrollbar-track {
59 64 border-radius: 10px;
... ... @@ -82,11 +87,19 @@ body {
82 87 }
83 88  
84 89 .bg-primary-gradient {
85   - background: linear-gradient(135deg, rgba(40, 112, 175, 1) 0%, rgba(0, 32, 66, 1) 100%);
  90 + background: linear-gradient(
  91 + 135deg,
  92 + rgba(40, 112, 175, 1) 0%,
  93 + rgba(0, 32, 66, 1) 100%
  94 + );
86 95 }
87 96  
88 97 .bg-primary-gradient-horizontal {
89   - background: linear-gradient(90deg, rgba(40, 112, 175, 1) 0%, rgba(0, 32, 66, 1) 100%);
  98 + background: linear-gradient(
  99 + 90deg,
  100 + rgba(40, 112, 175, 1) 0%,
  101 + rgba(0, 32, 66, 1) 100%
  102 + );
90 103 }
91 104  
92 105 .icon-dim {
... ... @@ -163,3 +176,11 @@ body {
163 176 justify-content: center !important;
164 177 display: flex !important;
165 178 }
  179 +
  180 +.z-index-0 {
  181 + z-index: 0;
  182 +}
  183 +
  184 +.w-15 {
  185 + width: 15% !important;
  186 +}
166 187 \ No newline at end of file