Martin Macola / autoservicio

Download as
Browse Code »

Commit fa5a6300a26e4b8a97fc8429c46f215d9396fd14

Authored by Eric Fernandez
2 parents bea5ae5ad9 6107917b60
Exists in master

Merge branch 'master' of http://git.focasoftware.com/angular/autoservicio

Showing 5 changed files   Show diff stats
src/app/components/busqueda-productos/busqueda-productos.component.html
Diff comments   View file @ fa5a630
... ... @@ -70,8 +70,7 @@
70 70 <div class="row justify-content-between m-0">
71 71 <div class="col-12 p-0">
72 72 <div class="text-left">
73   - <p class="m-0 h6"><small>{{producto.DetArt}}</small></p>
74   - <p class="m-0 h6"><small>COD. {{producto.CodRub}}</small></p>
  73 + <p class="m-0 h6"><small>{{producto.DET_LAR}}</small></p>
75 74 </div>
76 75 </div>
77 76 <div class="col-12 my-auto pt-2 pr-2 p-0">
src/app/components/cancelar-compra/cancelar-compra.component.html
Diff comments   View file @ fa5a630
1   -<div class="container-fluid p-0">
2   - <img src="{{apiUrl}}/imagenes/homeBackground.jpg" class="background-image">
3   - <div class="row m-0">
4   - <div class="col p-0">
5   - <div class="vh-100 fade-in d-flex align-content-strech flex-wrap disable-user-select">
  1 +<div class="container-fluid fade-in p-0 disable-user-select">
6 2  
7   - <!-- HEADER -->
8   - <div class="row m-0 w-100 bg-primary-gradient-horizontal">
9   - <div class="col-6 bg-white rounded-bottom-right">
10   - <div class="row h-100">
11   - <div class="col d-flex align-items-center">
12   - <img class="w-25 mx-auto d-block" src="{{apiUrl}}/imagenes/logoaxion.png">
13   - </div>
  3 + <!-- INFO -->
  4 + <div class="row vh-100 py-5 m-0 w-100 bg-primary-gradient-horizontal">
  5 + <div class="col-4 offset-1">
  6 + <div class="row h-100">
  7 + <div class="col-12 my-auto">
  8 + <div class="card rounded">
  9 + <img src="{{apiUrl}}/imagenes/atencion.svg" class="w-50 mx-auto mt-5 mb-4">
  10 + <div class="mb-5 mt-4">
  11 + <p class="display-3 card-text text-center font-weight-bold">
  12 + Atención
  13 + </p>
14 14 </div>
15 15 </div>
16 16 </div>
17   -
18   - <!-- INFO -->
19   - <div class="row h-75 py-5 m-0 w-100">
20   - <div class="col-4 offset-2">
21   - <div class="row h-100">
22   - <div class="col-12 py-4">
23   - <div class="card h-100 rounded">
24   - <img src="{{apiUrl}}/imagenes/atencion.svg" class="w-50 mx-auto mt-auto mb-4">
25   - <div class="mb-auto mt-4">
26   - <p class="display-3 card-text text-center font-weight-bold">
27   - Atención
28   - </p>
29   - </div>
30   - </div>
31   - </div>
32   - </div>
33   - </div>
34   - <div class="col-6 text-center text-white my-auto">
35   - <p class="display-3 font-weight-bold mb-5">
36   - Usted esta a punto<br>de cancelar su compra
37   - </p>
38   - <p class="display-4 m-0">
39   - Perderá los datos y<br>productos ya ingresados
40   - </p>
41   - <div class="d-flex justify-content-center mt-2">
42   - <button
43   - type="button"
44   - class="btn btn-lg btn-light shadow mr-4"
45   - (click)="volverPreviousPage()">
46   - <span class="pr-2">Volver a mi compra</span>
47   - <i class="fa fa-undo text-warning"></i>
48   - </button>
49   - <button
50   - type="button"
51   - class="btn btn-lg btn-light shadow ml-4"
52   - (click)="limpiarCarritoYvolver()">
53   - <span class="pr-2">Si, terminar</span>
54   - <i class="fa fa-times text-danger"></i>
55   - </button>
56   - </div>
57   - </div>
58   - </div>
59   -
60   - <!-- FOOTER -->
61   - <div class="row m-0 w-100 bg-gray">
62   - <div class="col-6 bg-white offset-6 rounded-top-left">
63   - <div class="row h-100">
64   - <div class="col d-flex align-items-center">
65   - <img class="w-25 mx-auto d-block" src="{{apiUrl}}/imagenes/logodebo.png">
66   - </div>
67   - </div>
68   - </div>
69   - </div>
70   -
  17 + </div>
  18 + </div>
  19 + <div class="col-6 text-center text-white my-auto">
  20 + <p class="display-3 font-weight-bold mb-5">
  21 + ¿Desea Cancelar su compra?
  22 + </p>
  23 + <div class="d-flex justify-content-center mt-2">
  24 + <button type="button" class="btn btn-lg btn-light shadow mr-4" (click)="volverPreviousPage()">
  25 + <span class="pr-2">Continuar con mi compra</span>
  26 + <i class="fa fa-undo text-warning"></i>
  27 + </button>
  28 + <button type="button" class="btn btn-lg btn-light shadow ml-4" (click)="limpiarCarritoYvolver()">
  29 + <span class="pr-2">Si, Cancelar</span>
  30 + <i class="fa fa-times text-danger"></i>
  31 + </button>
71 32 </div>
72 33 </div>
73 34 </div>
  35 +
74 36 </div>
src/app/components/cancelar-compra/cancelar-compra.component.ts
Diff comments   View file @ fa5a630
... ... @@ -2,6 +2,7 @@ import { Component, OnInit } from &#39;@angular/core&#39;;
2 2 import { appSettings } from 'src/etc/AppSettings';
3 3 import { Location } from '@angular/common';
4 4 import { Router } from '@angular/router';
  5 +import { ProductoService } from 'src/app/services/producto.service';
5 6  
6 7 @Component({
7 8 selector: 'app-cancelar-compra',
... ... @@ -14,10 +15,15 @@ export class CancelarCompraComponent implements OnInit {
14 15  
15 16 constructor(
16 17 private location: Location,
17   - private router: Router
  18 + private router: Router,
  19 + private productoService : ProductoService
18 20 ) { }
19 21  
20 22 ngOnInit() {
  23 +
  24 + setTimeout(() => {
  25 + this.limpiarCarritoYvolver();
  26 + }, 30000)
21 27 }
22 28  
23 29 volverPreviousPage() {
... ... @@ -27,6 +33,9 @@ export class CancelarCompraComponent implements OnInit {
27 33  
28 34 limpiarCarritoYvolver(){
29 35  
  36 + this.productoService.productoAcargar = undefined;
  37 + this.productoService.promoAcargar = undefined;
  38 + this.productoService.productos = [];
30 39 this.router.navigate(['/home']);
31 40 }
32 41  
src/app/components/inicio/inicio.component.html
Diff comments   View file @ fa5a630
... ... @@ -17,10 +17,10 @@
17 17 class="card card-effect bg-white border-0 shadow rounded w-100 mb-auto">
18 18 <div class="card-body text-left px-4 py-3">
19 19 <div class="row">
20   - <div class="col-7">
  20 + <div class="col-auto">
21 21 <p class="h3 card-title">Promociones</p>
22 22 </div>
23   - <div class="col-5 p-0">
  23 + <div class="col-auto p-0">
24 24 <img src="{{apiUrl}}/imagenes/primario.promociones.png" class="icon-dim m-0">
25 25 </div>
26 26 </div>
... ... @@ -48,10 +48,10 @@
48 48 <div class="card card-effect bg-white border-0 shadow rounded w-100 mt-4">
49 49 <div class="card-body text-left px-4 py-3">
50 50 <div class="row">
51   - <div class="col-5">
  51 + <div class="col-auto">
52 52 <p class="h3 card-title">Ordenar Pedido</p>
53 53 </div>
54   - <div class="col-7 p-0">
  54 + <div class="col-auto p-0">
55 55 <img src="{{apiUrl}}/imagenes/primario.ordenar.png" class="icon-dim">
56 56 </div>
57 57 </div>
... ... @@ -91,10 +91,10 @@
91 91 <div class="card bg-white border-0 shadow rounded mb-auto">
92 92 <div class="card-body text-left px-4 py-3">
93 93 <div class="row">
94   - <div class="col-6">
  94 + <div class="col-auto">
95 95 <p class="h3 card-title">Cargar Productos</p>
96 96 </div>
97   - <div class="col-6 p-0">
  97 + <div class="col-auto p-0">
98 98 <img src="{{apiUrl}}/imagenes/escanear.png" class="icon-dim mb-2">
99 99 </div>
100 100 </div>
... ... @@ -188,13 +188,13 @@
188 188 class="card card-effect bg-white border-0 shadow rounded w-100 mt-4">
189 189 <div class="card-body text-left px-4 py-3">
190 190 <div class="row">
191   - <div class="col-6">
  191 + <div class="col-auto">
192 192 <p class="h3 card-title">Buscar Productos</p>
193 193 <p class="h5 card-text text-muted font-weight-light">
194 194 Busque aquí los productos<br>
195 195 que no tienen código </p>
196 196 </div>
197   - <div class="col-6 p-0">
  197 + <div class="col-auto p-0">
198 198 <img src="{{apiUrl}}/imagenes/primario.buscar.png" class="icon-dim mb-2">
199 199 </div>
200 200 </div>
src/app/components/sidebar/sidebar.component.html
Diff comments   View file @ fa5a630
... ... @@ -76,7 +76,7 @@
76 76 <div class="col-12">
77 77 <p
78 78 class="h4 border-bottom border-secondary text-secondary pb-2">
79   - ({{getCantidadProductos()}}) items
  79 + ({{getCantidadProductos()}}) artículos
80 80 </p>
81 81 <p class="h3 text-secondary">Total</p>
82 82 <p class="h3 font-weight-bold">{{getTotal() | currency}}</p>