Mauricio Cattafi / autoservicio

Commit 23ca394d09fb9b887b99324bc3b7aad16fa19d42

Authored by Eric Fernandez 2019-09-09 17:23:15 -0300

2 parents c60e89269c a197254536

Merge branch 'master' into 'master'

Master(mpuebla)

See merge request !106

Showing 2 changed files Show diff stats

src/app/components/busqueda-productos/busqueda-productos.component.html

Diff comments View file @ 23ca394

 <div class="row m-0 fade-in">
   <div class="col-12 p-0">
     <!-- NOMBRE DE SECCION -->
     <div class="row m-0">
       <div class="col-12 p-0">
         <p class="h5 m-0 py-1 bg-gray text-muted text-center">
           {{title}}
           <i *ngIf="title === 'Búsqueda'" class="fa fa-search"></i>
         </p>
       </div>
     </div>
     <div class="container-fluid">
       <div class="row m-2 disable-user-select">
         <!-- FILTROS -->
         <div *ngIf="queMostrar != 'promociones'" class="col-sm-2 p-1">
           <div class="text-center">
             <p class="font-weight-bold text-muted border-bottom pb-2">Buscar por Categoría</p>
           </div>
           <ul class="list-group">
             <li
               [ngClass]="{active: categoriaActive == 0}"
               (click)="categoriaActive = 0; filterItems()"
               class="list-group-item list-group-item-action text-center my-1 p-2 h6">
               Todos
             </li>
             <li
               *ngFor="let categoria of categorias"
               [ngClass]="{active: categoriaActive == categoria.id}"
               (click)="categoriaActive = categoria.id; filterItems()"
               class="list-group-item list-group-item-action text-center my-1 p-2 h6">
               {{categoria.detalle}}
             </li>
           </ul>
         </div>
         <!-- SEARCH INPUT -->
         <div *ngIf="productos.length > 0" class="fade-in col p-0">
           <div class="row m-0 search">
+            <!-- BOTON VOLVER -->
+            <div class="col-sm-auto p-2">
+              <button
+                type="button"
+                class="btn btn-light btn-lg shadow-sm"
+                [routerLink]="['/inicio']">
+                <span class="font-weight-normal h6 pr-2">Volver</span>
+                <i class="fa fa-undo text-warning" aria-hidden="true"></i>
+              </button>
+            </div>
             <div class="col-sm-10 p-2">
               <span class="fa fa-search form-control-lg form-control-search pl-3"></span>
               <input
                 [matKeyboard]="'spanish'"
                 type="text"
                 class="form-control form-control-lg shadow-sm rounded-pill px-5"
                 placeholder="Búsqueda productos"
                 [(ngModel)]="searchTerm"
                 (ngModelChange)="filterItems()">
             </div>
-            <!-- BOTON VOLVER -->
-            <div class="col-sm-2 p-2">
-              <button
-                type="button"
-                class="btn btn-light btn-lg shadow-sm"
-                [routerLink]="['/inicio']">
-                <span class="font-weight-normal h6 pr-2">Volver</span>
-                <i class="fa fa-undo text-warning" aria-hidden="true"></i>
-              </button>
-            </div>
             <div class="col-sm-12 m-0 p-2 h5">
               <button
                 class="btn btn-outline-primary badge badge-light px-2 shadow-sm"
                 [ngClass]="{'active': ordenandoByVendidos}"
                 (click)="ordenandoByVendidos = !ordenandoByVendidos; filterItems()"
               >Más vendidos</button>
             </div>
           </div>
           <!-- LISTA DE PRODUCTOS -->
           <div class="row m-0 align-items-start vh-70 overflow-scroll disable-user-select">
             <div
               class="col-4 col-lg-3 p-2"
               *ngFor="let producto of auxProductos">
               <div
                 class="card-effect bg-white rounded-sm shadow border-0"
                 (click)="elegirProducto(producto)">
                 <img src="{{apiImagenes}}/imagenes/{{producto.imagenes[0].imagen}}" class="rounded-sm w-100 m-auto">
                 <div class="p-2">
                   <p class="h6 min-h-40 text-left m-0"><small>{{producto.DET_LAR}}</small></p>
                   <div class="row m-0">
                     <div class="col-12 my-auto pt-2 pr-2 p-0">
                       <p class="text-right m-0 h6">{{producto.PreVen | currency}}</p>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
         <!-- SPINNER -->
         <div
           *ngIf="productos.length === 0 && showSpinner"
           class="col-sm-10 p-0 align-self-center text-center">
           <div class="spinner-border spinner-lg text-secondary" role="status"></div>

src/app/components/popover-sinonimos/popover-sinonimos.component.html

Diff comments View file @ 23ca394

 <div class="card-body fade-left">
   <div class="row m-0">
     <div class="col text-left">
       <p class="h4 card-title">
         Personalice su pedido
       </p>
     </div>
   </div>
   <div class="row m-0 pr-2 my-2">
     <div class="col">
       <div class="row mb-2" *ngFor="let sinonimo of popoverContent; let i = index">
         <div class="col p-0">
           <div class="row bg-white text-dark m-0 py-1 shadow">
             <div class="col text-left">
               <p class="h5 m-0 card-title">
                 Elija opción -
                 <span [ngClass]="
                 {
                   'text-success': cantidadRestanteSinonimos == 0,
                   'text-danger': cantidadRestanteSinonimos > 0
                 }">
                   Cantidad Restante {{cantidadRestanteSinonimos}}
                 </span>
               </p>
             </div>
           </div>
           <div class="row m-0 popover-size overflow-scroll">
             <div class="col-12 p-0">
               <div class="row m-0 my-3 d-flex justify-content-between" *ngFor="let producto of sinonimo.productos">
                 <div class="col-7 p-0 h6 text-right">
                   <p class="m-0 font-weight-normal">
                     {{producto.DetArt}}
                   </p>
                 </div>
                 <div class="col-5 pr-0">
                   <div class="btn-group float-right my-auto" role="group">
                     <button
                       type="button"
                       class="btn btn-light my-auto border shadow"
                       (click)="sumarCantidad(producto, i)">
                       <i class="fa fa-plus" aria-hidden="true"></i>
                     </button>
                     <div class="bg-white border border-white px-3 py-1 my-auto text-dark h5">
                       <small
                         [ngClass]="{'font-weight-bold': producto.cantidad > 0}">
                         {{producto.cantidad}}
                       </small>
                     </div>
                     <button
                       type="button"
                       class="btn btn-light my-auto border shadow"
                       (click)="restarCantidad(producto, i)">
                       <i class="fa fa-minus" aria-hidden="true"></i>
                     </button>
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
   </div>
   <div class="row mt-3 justify-content-end">
     <div class="col">
       <button
+        [disabled]="cantidadRestanteSinonimos > 0"
         type="button"
         class="btn btn-block btn-light shadow"
         (click)="continuar()">
         <span class="font-weight-bold pr-2">Continuar</span>
         <i class="fa fa-check text-success" aria-hidden="true"></i>
       </button>
     </div>
   </div>
 </div>