diff --git a/package.json b/package.json index df22334..488402e 100644 --- a/package.json +++ b/package.json @@ -35,14 +35,14 @@ "pump": "^3.0.x" }, "devDependencies": { - "angular": "^1.7.5", - "angular-mocks": "^1.7.7", - "angular-route": "^1.7.5", + "angular": "^1.7.8", + "angular-mocks": "^1.7.8", + "angular-route": "^1.7.8", "bootstrap": "^4.1.3", "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git", "font-awesome": "^4.7.0", "gulp": "^3.9.1", - "gulp-angular-templatecache": "^2.2.5", + "gulp-angular-templatecache": "^2.2.7", "gulp-clean": "^0.4.0", "gulp-connect": "^5.6.1", "gulp-htmlmin": "^5.0.1", @@ -51,9 +51,9 @@ "gulp-replace": "^1.0.0", "gulp-uglify": "^3.0.1", "gulp-uglify-es": "^1.0.4", - "jasmine-core": "^3.3.0", - "jquery": "^3.3.1", - "jshint": "^2.9.6", + "jasmine-core": "^3.4.0", + "jquery": "^3.4.1", + "jshint": "^2.10.2", "pre-commit": "^1.2.2", "pump": "^3.0.0", "ui-bootstrap4": "^3.0.5" diff --git a/src/js/controllerItem.js b/src/js/controllerItem.js index 07e29c1..70cf9cb 100644 --- a/src/js/controllerItem.js +++ b/src/js/controllerItem.js @@ -64,6 +64,8 @@ angular.module('focaAbmVendedorCobrador') }); $scope.guardar = function() { + var cobradorComision = parseFloat($scope.vendedorCobrador.comisionCobrador); + var vendedorComision = parseFloat($scope.vendedorCobrador.comisionVendedor); if (!$scope.vendedorCobrador.NOM) { focaModalService.alert('Ingrese nombre'); @@ -86,12 +88,11 @@ angular.module('focaAbmVendedorCobrador') } else if (!$scope.vendedorCobrador.localidad.NOMBRE) { focaModalService.alert('Seleccione una localidad'); return; - } else if (!parseFloat($scope.vendedorCobrador.comisionCobrador) && - ($scope.vendedorCobrador.rol === 2 || $scope.vendedorCobrador.rol === 3)) { + } else if (($scope.vendedorCobrador.rol === 2 && isNaN(cobradorComision)) || + (($scope.vendedorCobrador.rol === 3) && isNaN(cobradorComision))) { focaModalService.alert('Ingrese una comision cobrador válida'); return; - } else if (!parseFloat($scope.vendedorCobrador.comisionVendedor) && - ($scope.vendedorCobrador.rol === 1 || $scope.vendedorCobrador.rol === 3)) { + } else if (($scope.vendedorCobrador.rol === 1 && isNaN(vendedorComision)) || ($scope.vendedorCobrador.rol === 3 && isNaN(vendedorComision))) { focaModalService.alert('Ingrese una comision vendedor válida'); return; } diff --git a/src/views/foca-abm-vendedor-cobrador-item.html b/src/views/foca-abm-vendedor-cobrador-item.html index ff73eef..06a24d6 100644 --- a/src/views/foca-abm-vendedor-cobrador-item.html +++ b/src/views/foca-abm-vendedor-cobrador-item.html @@ -15,6 +15,7 @@ @@ -71,6 +72,7 @@ class="form-control form-control-sm" foca-tipo-input teclado-virtual + solo-positivos ng-model="vendedorCobrador.codigoPostal" ng-required="true" foca-focus="focused == 3" @@ -139,6 +141,7 @@ class="form-control form-control-sm" foca-tipo-input teclado-virtual + solo-positivos limite-numeros-max="15" ng-model="vendedorCobrador.telefono" ng-required="true" @@ -157,6 +160,7 @@ class="form-control form-control-sm" foca-tipo-input teclado-virtual + solo-positivos limite-numeros-max="15" ng-model="vendedorCobrador.dni" ng-required="true" @@ -164,7 +168,6 @@ ng-focus="focused = 7" ng-keypress="next($event.keyCode)" autocomplete="off" - string-to-number /> @@ -183,7 +186,7 @@ ng-keypress="next($event.keyCode)" autocomplete="off" string-to-number - solo-positivo + solo-positivos /> @@ -202,7 +205,7 @@ ng-keypress="next($event.keyCode)" autocomplete="off" string-to-number - solo-positivo + solo-positivos />