Merge branch 'master' into 'master'

Master(mpuebla) See merge request !106

Merge branch 'master' into 'master'
Master(mpuebla) See merge request !106
Eric Fernandez
2 parents c60e89269c a197254536
Showing 2 changed files Show diff stats
src/app/components/busqueda-productos/busqueda-productos.component.html
src/app/components/popover-sinonimos/popover-sinonimos.component.html
@@ -40,6 +40,16 @@
         <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
@@ -50,16 +60,6 @@
                 [(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"
@@ -70,6 +70,7 @@
   <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()">
...	...	@@ -40,6 +40,16 @@
40	40	<div *ngIf="productos.length > 0" class="fade-in col p-0">
41	41
42	42	<div class="row m-0 search">
	43	+ <!-- BOTON VOLVER -->
	44	+ <div class="col-sm-auto p-2">
	45	+ <button
	46	+ type="button"
	47	+ class="btn btn-light btn-lg shadow-sm"
	48	+ [routerLink]="['/inicio']">
	49	+ <span class="font-weight-normal h6 pr-2">Volver</span>
	50	+ <i class="fa fa-undo text-warning" aria-hidden="true"></i>
	51	+ </button>
	52	+ </div>
43	53	<div class="col-sm-10 p-2">
44	54	<span class="fa fa-search form-control-lg form-control-search pl-3"></span>
45	55	<input
...	...	@@ -50,16 +60,6 @@
50	60	[(ngModel)]="searchTerm"
51	61	(ngModelChange)="filterItems()">
52	62	</div>
53		- <!-- BOTON VOLVER -->
54		- <div class="col-sm-2 p-2">
55		- <button
56		- type="button"
57		- class="btn btn-light btn-lg shadow-sm"
58		- [routerLink]="['/inicio']">
59		- <span class="font-weight-normal h6 pr-2">Volver</span>
60		- <i class="fa fa-undo text-warning" aria-hidden="true"></i>
61		- </button>
62		- </div>
63	63	<div class="col-sm-12 m-0 p-2 h5">
64	64	<button
65	65	class="btn btn-outline-primary badge badge-light px-2 shadow-sm"
...	...	@@ -70,6 +70,7 @@
70	70	<div class="row mt-3 justify-content-end">
71	71	<div class="col">
72	72	<button
	73	+ [disabled]="cantidadRestanteSinonimos > 0"
73	74	type="button"
74	75	class="btn btn-block btn-light shadow"
75	76	(click)="continuar()">