From f89651860a2e46d408cbcd437f29b1dcefa30542 Mon Sep 17 00:00:00 2001
From: Benjamin <brodriguez@focasoftware.com>
Date: Thu, 23 Jan 2020 16:31:44 -0300
Subject: [PATCH] envio pedidoPara en forma de booleano e guardar comprobantes

---
 .../modules/opcion-pedido/opcion-pedido.component.html    |  4 ++--
 src/app/modules/opcion-pedido/opcion-pedido.component.ts  |  3 ++-
 .../seleccion-articulos.component.html                    | 15 ++++++---------
 .../seleccion-articulos.component.scss                    |  6 ++++++
 src/app/services/articulo/articulo.service.ts             |  1 +
 src/app/shared/confirmacion/confirmacion.component.ts     |  4 ----
 src/scss/height-width.scss                                |  4 ----
 7 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/app/modules/opcion-pedido/opcion-pedido.component.html b/src/app/modules/opcion-pedido/opcion-pedido.component.html
index 3acf742..d2a409b 100644
--- a/src/app/modules/opcion-pedido/opcion-pedido.component.html
+++ b/src/app/modules/opcion-pedido/opcion-pedido.component.html
@@ -19,7 +19,7 @@
       <div class="col-auto px-0 h-auto align-self-start">
         <div
           class="btn-effect col-auto align-self-center px-0 bg-white"
-          (click)="goTo('/seleccion-articulos'); seleccionPedido('comer aca')">
+          (click)="goTo('/seleccion-articulos'); seleccionPedido('false')">
           <div class="row mx-0 bg-primary badge-pill">
             <div class="col-auto p-0">
               <img
@@ -46,7 +46,7 @@
       <div class="col-auto px-0 h-auto align-self-start">
         <div
           class="btn-effect col-auto align-self-center px-0 bg-white"
-          (click)="goTo('/seleccion-articulos'); seleccionPedido('para llevar')">
+          (click)="goTo('/seleccion-articulos'); seleccionPedido('true')">
           <div class="row mx-0 bg-primary badge-pill">
             <div class="col-auto p-0">
               <img
diff --git a/src/app/modules/opcion-pedido/opcion-pedido.component.ts b/src/app/modules/opcion-pedido/opcion-pedido.component.ts
index e2b17d8..a4b7ad6 100644
--- a/src/app/modules/opcion-pedido/opcion-pedido.component.ts
+++ b/src/app/modules/opcion-pedido/opcion-pedido.component.ts
@@ -20,6 +20,7 @@ export class OpcionPedidoComponent implements OnInit {
   }
 
   seleccionPedido(lugar) {
-    localStorage.setItem('pedidoPara', lugar);
+    lugar === 'true' ? lugar = true : false;
+    localStorage.setItem('pedidoParaLlevar', lugar);
   }
 }
diff --git a/src/app/modules/seleccion-articulos/seleccion-articulos.component.html b/src/app/modules/seleccion-articulos/seleccion-articulos.component.html
index 66311d9..2f405e4 100644
--- a/src/app/modules/seleccion-articulos/seleccion-articulos.component.html
+++ b/src/app/modules/seleccion-articulos/seleccion-articulos.component.html
@@ -13,7 +13,7 @@
     </div>
     <!-- CUERPO -->
     <div class="row w-100 mr-4 h-50 h-md-70">
-      <div class="col-12 h-100 px-0 py-3">
+      <div class="col-12 h-100 px-0 py-2">
         <div class="row mx-0 h-100">
           <!-- FILTRO CATEGORIAS -->
           <div class="col-5 col-sm-3 col-xl-2 h-100">
@@ -33,11 +33,11 @@
               <!-- CATEGORIAS -->
               <div
                 #templateCategorias
-                class="col-12 px-0 box-categorias border border-primary border-left-0 rounded-right scroll-y"
+                class="col-12 px-0 box-categorias border border-primary border-left-0 rounded-right scroll-y pt-1"
                 (scroll)="scrollEvent($event)">
                 <div
                   class="row mx-4 mb-2 h-25 h-md-32 h-lg-45 justify-content-center tab"
-                  [ngClass]="{ 'active': allActive, 'border-bottom-effect': !allActive }"
+                  [ngClass]="{ 'active rounded-sm shadow': allActive, 'border-bottom-effect': !allActive }"
                   (click)="selectCategoria(-1, 0)">
                   <img
                     draggable="false"
@@ -49,7 +49,7 @@
                 </div>
                 <div
                   class="row mx-4 mb-2 h-25 h-md-32 h-lg-45 justify-content-center tab"
-                  [ngClass]="{ 'active': categoria.selected, 'border-bottom-effect': !categoria.selected }"
+                  [ngClass]="{ 'active rounded-sm shadow': categoria.selected, 'border-bottom-effect': !categoria.selected }"
                   (click)="selectCategoria(i, categoria.id)"
                   *ngFor="let categoria of categorias; let i = index;">
                   <img
@@ -59,7 +59,7 @@
                     class="col-12 h-50 align-self-end d-none d-sm-block rounded-circle"
                     src="{{urlImagenes}}{{categoria.path_imagen}}"
                     onerror="this.src='assets/img/image-not-found.jpg'">
-                  <small class="col-12 px-0 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small>
+                  <small class="col-12 px-1 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small>
                 </div>
               </div>
               <div class="col-auto btn-effect h-5">
@@ -98,10 +98,7 @@
                     <p
                     [ngClass]="{'text-primary': articulo.PRO, 'text-secondary': !articulo.PRO}"
                       class="col-12 px-1 h6 h-auto text-center min-h-60">
-                      {{articulo.DetArt}}
-                    </p>
-                    <p class="col-12 px-1 h-auto text-center line-height-sm min-h-50">
-                      <small>{{articulo.DET_LAR}}</small>
+                      {{articulo.DetArt.toUpperCase()}}
                     </p>
                     <div class="col-12 px-1 align-self-end h-auto">
                       <div
diff --git a/src/app/modules/seleccion-articulos/seleccion-articulos.component.scss b/src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
index c7408a3..7ead42b 100644
--- a/src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
+++ b/src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
@@ -7,6 +7,12 @@ $primary: #aa006b;
 .active {
   background-color: white;
   border-bottom: 3px solid $primary !important;
+  border-top: 3px solid $primary !important;
+  border-left: 3px solid $primary !important;
+  border-right: 3px solid $primary !important;
+  .border {
+    opacity: 40%;
+  }
 }
 
 .border-bottom-effect {
diff --git a/src/app/services/articulo/articulo.service.ts b/src/app/services/articulo/articulo.service.ts
index c12208f..5b92a0e 100644
--- a/src/app/services/articulo/articulo.service.ts
+++ b/src/app/services/articulo/articulo.service.ts
@@ -67,6 +67,7 @@ export class ArticuloService {
             puntoVenta: APP_SETTINGS.puntoVenta,
             pedidoAnombreDe: dataPago.pedidoAnombreDe,
             numeroPlanilla: APP_SETTINGS.numeroPlanilla,
+            pedidoParaLlevar: localStorage.getItem('pedidoParaLlevar'),
           })
             .subscribe((data) => {
               observer.next(data);
diff --git a/src/app/shared/confirmacion/confirmacion.component.ts b/src/app/shared/confirmacion/confirmacion.component.ts
index 7264eff..56edc92 100644
--- a/src/app/shared/confirmacion/confirmacion.component.ts
+++ b/src/app/shared/confirmacion/confirmacion.component.ts
@@ -11,10 +11,6 @@ import { Subject } from 'rxjs';
   styleUrls: ['./confirmacion.component.scss']
 })
 export class ConfirmacionComponent implements OnInit {
-  idArticulo: number;
-  imagenArticulo: any;
-  detLarArticulo: string;
-  preVenArticulo: any;
   onClose: Subject<any>;
 
   constructor(
diff --git a/src/scss/height-width.scss b/src/scss/height-width.scss
index c8b57b7..8c2abf5 100644
--- a/src/scss/height-width.scss
+++ b/src/scss/height-width.scss
@@ -32,10 +32,6 @@
   }
 }
 
-.min-h-50 {
-  min-height: 50px;
-}
-
 .min-h-60 {
   min-height: 60px;
 }
-- 
1.9.1