Merge branch 'master' into 'master'

master(efernandez) See merge request modulos-npm/foca-modal-flete!5

Merge branch 'master' into 'master'
master(efernandez) See merge request modulos-npm/foca-modal-flete!5
Nicolás Guarnieri
2 parents b49a510e34 ff3c9d9e15
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/modal-flete.html
@@ -9,9 +9,9 @@ angular.module(&#39;focaModalFlete&#39;)
                 $scope.parametrosFlete = parametrosFlete;
                 $scope.aceptar = function() {
                     var parametrosFlete = {
-                        flete: $scope.parametrosFlete.flete === '1' ? '1' : '0',
-                        FOB: $scope.parametrosFlete.flete === 'FOB' ? '1' : '0',
-                        bomba: $scope.parametrosFlete.bomba === '1' ? '1' : '0',
+                        flete: $scope.parametrosFlete.flete === '1' ? true : false,
+                        FOB: $scope.parametrosFlete.flete === 'FOB' ? true : false,
+                        bomba: $scope.parametrosFlete.bomba === '1' ? true : false,
                         kilometros: $scope.parametrosFlete.kilometros
                     };
                     $uibModalInstance.close(parametrosFlete);
@@ -80,6 +80,8 @@
                     <div class="col-sm-8">
                         <input
                             type="number"
+                            min="0"
+                            step="0.01"
                             class="form-control"
                             id="kilometros"
                             name="kilometros"
...	...	@@ -9,9 +9,9 @@ angular.module('focaModalFlete')
9	9	$scope.parametrosFlete = parametrosFlete;
10	10	$scope.aceptar = function() {
11	11	var parametrosFlete = {
12		- flete: $scope.parametrosFlete.flete === '1' ? '1' : '0',
13		- FOB: $scope.parametrosFlete.flete === 'FOB' ? '1' : '0',
14		- bomba: $scope.parametrosFlete.bomba === '1' ? '1' : '0',
	12	+ flete: $scope.parametrosFlete.flete === '1' ? true : false,
	13	+ FOB: $scope.parametrosFlete.flete === 'FOB' ? true : false,
	14	+ bomba: $scope.parametrosFlete.bomba === '1' ? true : false,
15	15	kilometros: $scope.parametrosFlete.kilometros
16	16	};
17	17	$uibModalInstance.close(parametrosFlete);