diff --git a/package.json b/package.json index 1c4cbe0..319d9da 100644 --- a/package.json +++ b/package.json @@ -25,18 +25,18 @@ "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git", "font-awesome": "^4.7.0", "gulp": "^3.9.1", - "gulp-angular-templatecache": "2.2.2", - "gulp-clean": "0.4.0", + "gulp-angular-templatecache": "^2.2.2", + "gulp-clean": "^0.4.0", "gulp-concat": "^2.6.1", "gulp-connect": "^5.6.1", - "gulp-htmlmin": "5.0.1", - "gulp-jshint": "2.1.0", - "gulp-rename": "1.4.0", - "gulp-replace": "1.0.0", - "gulp-uglify": "3.0.1", + "gulp-htmlmin": "^5.0.1", + "gulp-jshint": "^2.1.0", + "gulp-rename": "^1.4.0", + "gulp-replace": "^1.0.0", + "gulp-uglify": "^3.0.1", "jquery": "^3.3.1", - "jshint": "2.9.6", - "pump": "3.0.0", + "jshint": "^2.9.6", + "pump": "^3.0.0", "ui-bootstrap4": "^3.0.5" } } diff --git a/src/js/controller.js b/src/js/controller.js index 7840e9a..ca87921 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -8,7 +8,13 @@ angular.module('focaModalFlete') function($filter, $scope, $uibModalInstance, parametrosFlete) { $scope.parametrosFlete = parametrosFlete; $scope.aceptar = function() { - $uibModalInstance.close($scope.parametrosFlete); + var parametrosFlete = { + flete: $scope.parametrosFlete.flete === '1' ? '1' : '0', + FOB: $scope.parametrosFlete.flete === 'FOB' ? '1' : '0', + bomba: $scope.parametrosFlete.bomba === '1' ? '1' : '0', + kilometros: $scope.parametrosFlete.kilometros + }; + $uibModalInstance.close(parametrosFlete); }; $scope.cancel = function() { @@ -18,11 +24,11 @@ angular.module('focaModalFlete') $scope.validar = function() { return $scope.formFlete.$pristine || ( - $scope.parametrosFlete.flete === 'si' && + $scope.parametrosFlete.flete === '1' && ( ( - $scope.parametrosFlete.bomba !== 'si' && - $scope.parametrosFlete.bomba !== 'no' + $scope.parametrosFlete.bomba !== '1' && + $scope.parametrosFlete.bomba !== '0' ) || ( !$scope.parametrosFlete.kilometros || diff --git a/src/views/modal-flete.html b/src/views/modal-flete.html index 6350fc3..c6d3912 100644 --- a/src/views/modal-flete.html +++ b/src/views/modal-flete.html @@ -14,7 +14,7 @@ type="radio" name="flete" id="fleteSi" - value="si" + value="1" checked ng-model="parametrosFlete.flete" /> @@ -26,7 +26,7 @@ type="radio" name="flete" id="fleteNo" - value="no" + value="0" ng-model="parametrosFlete.flete" /> @@ -47,7 +47,7 @@