Luis Suarez / autoservicio-axion

Download as
Browse Code ยป

Commit f89651860a2e46d408cbcd437f29b1dcefa30542

Authored by Benjamin Rodriguez
1 parent 26bf5d0993
Exists in develop

envio pedidoPara en forma de booleano e guardar comprobantes

Showing 7 changed files with 17 additions and 20 deletions   Show diff stats
src/app/modules/opcion-pedido/opcion-pedido.component.html
Diff comments   View file @ f896518
... ... @@ -19,7 +19,7 @@
19 19 <div class="col-auto px-0 h-auto align-self-start">
20 20 <div
21 21 class="btn-effect col-auto align-self-center px-0 bg-white"
22   - (click)="goTo('/seleccion-articulos'); seleccionPedido('comer aca')">
  22 + (click)="goTo('/seleccion-articulos'); seleccionPedido('false')">
23 23 <div class="row mx-0 bg-primary badge-pill">
24 24 <div class="col-auto p-0">
25 25 <img
... ... @@ -46,7 +46,7 @@
46 46 <div class="col-auto px-0 h-auto align-self-start">
47 47 <div
48 48 class="btn-effect col-auto align-self-center px-0 bg-white"
49   - (click)="goTo('/seleccion-articulos'); seleccionPedido('para llevar')">
  49 + (click)="goTo('/seleccion-articulos'); seleccionPedido('true')">
50 50 <div class="row mx-0 bg-primary badge-pill">
51 51 <div class="col-auto p-0">
52 52 <img
src/app/modules/opcion-pedido/opcion-pedido.component.ts
Diff comments   View file @ f896518
... ... @@ -20,6 +20,7 @@ export class OpcionPedidoComponent implements OnInit {
20 20 }
21 21  
22 22 seleccionPedido(lugar) {
23   - localStorage.setItem('pedidoPara', lugar);
  23 + lugar === 'true' ? lugar = true : false;
  24 + localStorage.setItem('pedidoParaLlevar', lugar);
24 25 }
25 26 }
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
Diff comments   View file @ f896518
... ... @@ -13,7 +13,7 @@
13 13 </div>
14 14 <!-- CUERPO -->
15 15 <div class="row w-100 mr-4 h-50 h-md-70">
16   - <div class="col-12 h-100 px-0 py-3">
  16 + <div class="col-12 h-100 px-0 py-2">
17 17 <div class="row mx-0 h-100">
18 18 <!-- FILTRO CATEGORIAS -->
19 19 <div class="col-5 col-sm-3 col-xl-2 h-100">
... ... @@ -33,11 +33,11 @@
33 33 <!-- CATEGORIAS -->
34 34 <div
35 35 #templateCategorias
36   - class="col-12 px-0 box-categorias border border-primary border-left-0 rounded-right scroll-y"
  36 + class="col-12 px-0 box-categorias border border-primary border-left-0 rounded-right scroll-y pt-1"
37 37 (scroll)="scrollEvent($event)">
38 38 <div
39 39 class="row mx-4 mb-2 h-25 h-md-32 h-lg-45 justify-content-center tab"
40   - [ngClass]="{ 'active': allActive, 'border-bottom-effect': !allActive }"
  40 + [ngClass]="{ 'active rounded-sm shadow': allActive, 'border-bottom-effect': !allActive }"
41 41 (click)="selectCategoria(-1, 0)">
42 42 <img
43 43 draggable="false"
... ... @@ -49,7 +49,7 @@
49 49 </div>
50 50 <div
51 51 class="row mx-4 mb-2 h-25 h-md-32 h-lg-45 justify-content-center tab"
52   - [ngClass]="{ 'active': categoria.selected, 'border-bottom-effect': !categoria.selected }"
  52 + [ngClass]="{ 'active rounded-sm shadow': categoria.selected, 'border-bottom-effect': !categoria.selected }"
53 53 (click)="selectCategoria(i, categoria.id)"
54 54 *ngFor="let categoria of categorias; let i = index;">
55 55 <img
... ... @@ -59,7 +59,7 @@
59 59 class="col-12 h-50 align-self-end d-none d-sm-block rounded-circle"
60 60 src="{{urlImagenes}}{{categoria.path_imagen}}"
61 61 onerror="this.src='assets/img/image-not-found.jpg'">
62   - <small class="col-12 px-0 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small>
  62 + <small class="col-12 px-1 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small>
63 63 </div>
64 64 </div>
65 65 <div class="col-auto btn-effect h-5">
... ... @@ -98,10 +98,7 @@
98 98 <p
99 99 [ngClass]="{'text-primary': articulo.PRO, 'text-secondary': !articulo.PRO}"
100 100 class="col-12 px-1 h6 h-auto text-center min-h-60">
101   - {{articulo.DetArt}}
102   - </p>
103   - <p class="col-12 px-1 h-auto text-center line-height-sm min-h-50">
104   - <small>{{articulo.DET_LAR}}</small>
  101 + {{articulo.DetArt.toUpperCase()}}
105 102 </p>
106 103 <div class="col-12 px-1 align-self-end h-auto">
107 104 <div
src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
Diff comments   View file @ f896518
... ... @@ -7,6 +7,12 @@ $primary: #aa006b;
7 7 .active {
8 8 background-color: white;
9 9 border-bottom: 3px solid $primary !important;
  10 + border-top: 3px solid $primary !important;
  11 + border-left: 3px solid $primary !important;
  12 + border-right: 3px solid $primary !important;
  13 + .border {
  14 + opacity: 40%;
  15 + }
10 16 }
11 17  
12 18 .border-bottom-effect {
src/app/services/articulo/articulo.service.ts
Diff comments   View file @ f896518
... ... @@ -67,6 +67,7 @@ export class ArticuloService {
67 67 puntoVenta: APP_SETTINGS.puntoVenta,
68 68 pedidoAnombreDe: dataPago.pedidoAnombreDe,
69 69 numeroPlanilla: APP_SETTINGS.numeroPlanilla,
  70 + pedidoParaLlevar: localStorage.getItem('pedidoParaLlevar'),
70 71 })
71 72 .subscribe((data) => {
72 73 observer.next(data);
src/app/shared/confirmacion/confirmacion.component.ts
Diff comments   View file @ f896518
... ... @@ -11,10 +11,6 @@ import { Subject } from &#39;rxjs&#39;;
11 11 styleUrls: ['./confirmacion.component.scss']
12 12 })
13 13 export class ConfirmacionComponent implements OnInit {
14   - idArticulo: number;
15   - imagenArticulo: any;
16   - detLarArticulo: string;
17   - preVenArticulo: any;
18 14 onClose: Subject<any>;
19 15  
20 16 constructor(
src/scss/height-width.scss
Diff comments   View file @ f896518
... ... @@ -32,10 +32,6 @@
32 32 }
33 33 }
34 34  
35   -.min-h-50 {
36   - min-height: 50px;
37   -}
38   -
39 35 .min-h-60 {
40 36 min-height: 60px;
41 37 }