Marcelo Puebla / autoservicio-axion

Download as
Browse Code »

Commit 18e8603dafbc39803af10f407fbe8e16d5ec2b5b

Authored by Marcelo Puebla
2 parents 75cc199757 90d685867b
Exists in develop

Merge branch 'develop' into 'develop' 

Develop

See merge request !138
Showing 2 changed files   Show diff stats
src/app/modules/pedidos-salientes/pedidos-salientes.component.html
Diff comments   View file @ 18e8603
1   -<div class="row mx-0 py-5 px-2 h-100 justify-content-around">
2   - <div class="col-4">
3   - <div class="p-3 bg-white text-center shadow-lg rounded h-100">
4   - <p class="h5 mt-3">ESTAMOS</p>
5   - <p class="h3 font-weight-bold text-secondary">preparando</p>
6   - <p class="h5">TU PEDIDO</p>
7   - <div
8   - *ngFor="let pedido of pedidosPendientes; let i = index"
9   - [hidden]="i > 3"
10   - class="font-weight-bold mb-2 text-muted">
11   - <p class="display-4">{{rellenar(pedido.id.toString().slice(0), 3)}}</p>
12   - </div>
13   - </div>
14   - </div>
15   - <div class="col-4">
  1 +<div class="row mt-2 justify-content-center h-15">
  2 + <div class="col-3 col-lg-2">
16 3 <img
17 4 draggable="false"
18 5 ondragstart="return false;"
19 6 (contextmenu)="false"
20   - class="w-40 h-auto d-block mx-auto"
  7 + class="w-60 h-auto d-block mx-auto"
21 8 src="assets/img/logo-spot.svg">
22   - <div class="p-3 text-center h-100">
23   - <p class="h5 mt-3">LISTO PARA</p>
24   - <p class="h3 font-weight-bold text-primary">retirar</p>
25   - <div *ngIf="pedidosFinalizados.length">
26   - <p class="display-1 mt-2 text-primary mb-0">{{rellenar(pedidosFinalizados[0].id.toString().slice(0), 3)}}</p>
27   - </div>
28   - <p class="h3 font-weight-bold text-info mt-2">¡Que lo disfrutes!</p>
29   - </div>
30 9 </div>
31   - <div class="col-4">
  10 +</div>
  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">
32 13 <div class="p-3 bg-white text-center shadow-lg rounded h-100">
33   - <p class="h5 mt-3">YA FUÉ</p>
34   - <p class="h3 font-weight-bold text-primary">entregado</p>
35   - <p class="h5">TU PEDIDO</p>
  14 + <h5 class="pt-3">ESTAMOS</h5>
  15 + <h3 class="font-weight-bold text-secondary">preparando</h3>
  16 + <h5>TU PEDIDO</h5>
36 17 <div
37   - *ngFor="let pedido of pedidosFinalizados; let i = index"
38   - [hidden]="i > 4 || i == 0"
  18 + *ngFor="let pedido of pedidosPendientes; let i = index"
  19 + [hidden]="i > 3"
39 20 class="font-weight-bold mb-2 text-muted">
40   - <p class="display-4">{{rellenar(pedido.id.toString().slice(0), 3)}}</p>
  21 + <h1 class="display-4">{{rellenar(pedido.id.toString().slice(0), 3)}}</h1>
  22 + </div>
  23 + </div>
  24 + </div>
  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">
  27 + <h5 class="pt-3">LISTO PARA</h5>
  28 + <h3 class="font-weight-bold text-primary">retirar</h3>
  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>
  31 + <hr class="line mt-0">
41 32 </div>
  33 + <h3 class="font-weight-bold text-info mt-4">¡Que lo disfrutes!</h3>
42 34 </div>
43 35 </div>
44 36 </div>
src/app/modules/pedidos-salientes/pedidos-salientes.component.ts
Diff comments   View file @ 18e8603
... ... @@ -7,7 +7,7 @@ import { ComandaService } from &#39;src/app/services/comanda/comanda.service&#39;;
7 7 styleUrls: ['./pedidos-salientes.component.scss']
8 8 })
9 9 export class PedidosSalientesComponent implements OnInit {
10   - pedidosFinalizados = [];
  10 + pedidoFinalizado = [];
11 11 cicloTime;
12 12 pedidosPendientes = [];
13 13  
... ... @@ -28,7 +28,7 @@ export class PedidosSalientesComponent implements OnInit {
28 28 buscarPedidosFinalizados() {
29 29 this.comandaServices.getPendientesEntrega()
30 30 .subscribe((pedidos: []) => {
31   - this.pedidosFinalizados = pedidos;
  31 + this.pedidoFinalizado = pedidos;
32 32 });
33 33 }
34 34