Merge branch 'develop' into 'master'

Develop See merge request !12

Merge branch 'develop' into 'master'
Develop See merge request !12
Eric Fernandez
2 parents 16a91d94ac e99531c001
Showing 1 changed file Show diff stats
src/views/modal-precio-condicion.html
@@ -5,6 +5,13 @@
             <h5 ng-show="ingreso" class="modal-title my-1">Nuevos Plazos</h5>
         </div>
         <div class="input-group col-lg-6 pr-0 my-2" ng-show="!ingreso">
+            <button 
+                class="btn btn-outline-debo mr-2"
+                ng-click="ingreso = true"
+                ng-show="!ingreso"
+                title="Nuevo">
+                <i class="fa fa-plus" aria-hidden="true"></i>
+            </button>
             <input
                 type="text"
                 class="form-control form-control-sm"
@@ -49,32 +56,6 @@
                     No se encontraron resultados.
                 </td>
             </tr>
-            <tr>
-                <td colspan="4" ng-show="!ingreso">
-                    <input
-                        class="form-control form-control-sm"
-                        type="text"
-                        placeholder="Selección manual"
-                        readonly
-                        ng-click="ingreso = !ingreso"
-                        />
-                </td>
-                <td colspan="1" ng-show="!ingreso">
-                    <button
-                        type="button"
-                        class="btn btn-sm p-1 float-right"
-                        ng-class="{
-                            'btn-secondary': selectedPrecioCondicion != 0,
-                            'btn-primary': selectedPrecioCondicion == 0
-                        }"
-                        foca-focus="selectedPrecioCondicion == 0"
-                        ng-keydown="itemProducto($event.keyCode)"
-                        ng-click="ingreso = !ingreso"
-                    >
-                        <i class="fa fa-circle-thin" aria-hidden="true"></i>
-                    </button>
-                </td>
-            </tr>
             <tr class="selectable"
                 ng-repeat="(key, precioCondicion) in currentPagePrecioCondicion">
                 <td ng-bind="precioCondicion.id | rellenarDigitos: 4: 0"
...	...	@@ -5,6 +5,13 @@
5	5	<h5 ng-show="ingreso" class="modal-title my-1">Nuevos Plazos</h5>
6	6	</div>
7	7	<div class="input-group col-lg-6 pr-0 my-2" ng-show="!ingreso">
	8	+ <button
	9	+ class="btn btn-outline-debo mr-2"
	10	+ ng-click="ingreso = true"
	11	+ ng-show="!ingreso"
	12	+ title="Nuevo">
	13	+ <i class="fa fa-plus" aria-hidden="true"></i>
	14	+ </button>
8	15	<input
9	16	type="text"
10	17	class="form-control form-control-sm"
...	...	@@ -49,32 +56,6 @@
49	56	No se encontraron resultados.
50	57	</td>
51	58	</tr>
52		- <tr>
53		- <td colspan="4" ng-show="!ingreso">
54		- <input
55		- class="form-control form-control-sm"
56		- type="text"
57		- placeholder="Selección manual"
58		- readonly
59		- ng-click="ingreso = !ingreso"
60		- />
61		- </td>
62		- <td colspan="1" ng-show="!ingreso">
63		- <button
64		- type="button"
65		- class="btn btn-sm p-1 float-right"
66		- ng-class="{
67		- 'btn-secondary': selectedPrecioCondicion != 0,
68		- 'btn-primary': selectedPrecioCondicion == 0
69		- }"
70		- foca-focus="selectedPrecioCondicion == 0"
71		- ng-keydown="itemProducto($event.keyCode)"
72		- ng-click="ingreso = !ingreso"
73		- >
74		- <i class="fa fa-circle-thin" aria-hidden="true"></i>
75		- </button>
76		- </td>
77		- </tr>
78	59	<tr class="selectable"
79	60	ng-repeat="(key, precioCondicion) in currentPagePrecioCondicion">
80	61	<td ng-bind="precioCondicion.id \| rellenarDigitos: 4: 0"