Luis Suarez / foca-abm-vendedor-cobrador

Download as
Browse Code »

Commit 88f6b8dd8a59e459466423a67375d88be172358d

Authored by Eric Fernandez
2 parents 6e2a14373b 5f9ac1fe1f
Exists in master and in 2 other branches develop, lab

Merge branch 'develop' into 'master' 

Develop

See merge request !33
Showing 3 changed files   Show diff stats
... ... @@ -35,14 +35,14 @@
35 35 "pump": "^3.0.x"
36 36 },
37 37 "devDependencies": {
38   - "angular": "^1.7.5",
39   - "angular-mocks": "^1.7.7",
40   - "angular-route": "^1.7.5",
  38 + "angular": "^1.7.8",
  39 + "angular-mocks": "^1.7.8",
  40 + "angular-route": "^1.7.8",
41 41 "bootstrap": "^4.1.3",
42 42 "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git",
43 43 "font-awesome": "^4.7.0",
44 44 "gulp": "^3.9.1",
45   - "gulp-angular-templatecache": "^2.2.5",
  45 + "gulp-angular-templatecache": "^2.2.7",
46 46 "gulp-clean": "^0.4.0",
47 47 "gulp-connect": "^5.6.1",
48 48 "gulp-htmlmin": "^5.0.1",
... ... @@ -51,9 +51,9 @@
51 51 "gulp-replace": "^1.0.0",
52 52 "gulp-uglify": "^3.0.1",
53 53 "gulp-uglify-es": "^1.0.4",
54   - "jasmine-core": "^3.3.0",
55   - "jquery": "^3.3.1",
56   - "jshint": "^2.9.6",
  54 + "jasmine-core": "^3.4.0",
  55 + "jquery": "^3.4.1",
  56 + "jshint": "^2.10.2",
57 57 "pre-commit": "^1.2.2",
58 58 "pump": "^3.0.0",
59 59 "ui-bootstrap4": "^3.0.5"
src/js/controllerItem.js
Diff comments   View file @ 88f6b8d
... ... @@ -64,6 +64,8 @@ angular.module('focaAbmVendedorCobrador')
64 64 });
65 65  
66 66 $scope.guardar = function() {
  67 + var cobradorComision = parseFloat($scope.vendedorCobrador.comisionCobrador);
  68 + var vendedorComision = parseFloat($scope.vendedorCobrador.comisionVendedor);
67 69  
68 70 if (!$scope.vendedorCobrador.NOM) {
69 71 focaModalService.alert('Ingrese nombre');
... ... @@ -86,12 +88,12 @@ angular.module('focaAbmVendedorCobrador')
86 88 } else if (!$scope.vendedorCobrador.localidad.NOMBRE) {
87 89 focaModalService.alert('Seleccione una localidad');
88 90 return;
89   - } else if (!parseFloat($scope.vendedorCobrador.comisionCobrador) &&
90   - ($scope.vendedorCobrador.rol === 2 || $scope.vendedorCobrador.rol === 3)) {
  91 + } else if (($scope.vendedorCobrador.rol === 2 && isNaN(cobradorComision)) ||
  92 + (($scope.vendedorCobrador.rol === 3) && isNaN(cobradorComision))) {
91 93 focaModalService.alert('Ingrese una comision cobrador válida');
92 94 return;
93   - } else if (!parseFloat($scope.vendedorCobrador.comisionVendedor) &&
94   - ($scope.vendedorCobrador.rol === 1 || $scope.vendedorCobrador.rol === 3)) {
  95 + } else if (($scope.vendedorCobrador.rol === 1 && isNaN(vendedorComision)) ||
  96 + ($scope.vendedorCobrador.rol === 3 && isNaN(vendedorComision))) {
95 97 focaModalService.alert('Ingrese una comision vendedor válida');
96 98 return;
97 99 }
src/views/foca-abm-vendedor-cobrador-item.html
Diff comments   View file @ 88f6b8d
... ... @@ -15,6 +15,7 @@
15 15 <input
16 16 class="form-control form-control-sm"
17 17 ng-model="vendedorCobrador.NUM"
  18 + solo-positivos
18 19 ng-disabled="edicion"/>
19 20 </div>
20 21 </div>
... ... @@ -71,6 +72,7 @@
71 72 class="form-control form-control-sm"
72 73 foca-tipo-input
73 74 teclado-virtual
  75 + solo-positivos
74 76 ng-model="vendedorCobrador.codigoPostal"
75 77 ng-required="true"
76 78 foca-focus="focused == 3"
... ... @@ -139,6 +141,7 @@
139 141 class="form-control form-control-sm"
140 142 foca-tipo-input
141 143 teclado-virtual
  144 + solo-positivos
142 145 limite-numeros-max="15"
143 146 ng-model="vendedorCobrador.telefono"
144 147 ng-required="true"
... ... @@ -157,6 +160,7 @@
157 160 class="form-control form-control-sm"
158 161 foca-tipo-input
159 162 teclado-virtual
  163 + solo-positivos
160 164 limite-numeros-max="15"
161 165 ng-model="vendedorCobrador.dni"
162 166 ng-required="true"
... ... @@ -164,7 +168,6 @@
164 168 ng-focus="focused = 7"
165 169 ng-keypress="next($event.keyCode)"
166 170 autocomplete="off"
167   - string-to-number
168 171 />
169 172 </div>
170 173 </div>
... ... @@ -183,7 +186,7 @@
183 186 ng-keypress="next($event.keyCode)"
184 187 autocomplete="off"
185 188 string-to-number
186   - solo-positivo
  189 + solo-positivos
187 190 />
188 191 </div>
189 192 </div>
... ... @@ -202,7 +205,7 @@
202 205 ng-keypress="next($event.keyCode)"
203 206 autocomplete="off"
204 207 string-to-number
205   - solo-positivo
  208 + solo-positivos
206 209 />
207 210 </div>
208 211 </div>