Merge branch 'master' into 'develop'

Master See merge request !27

Merge branch 'master' into 'develop'
Master See merge request !27
Jose Pinto
2 parents 2adebe2d11 0db90a410d
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/foca-busqueda-cliente-modal.html
@@ -538,7 +538,7 @@ angular.module(&#39;focaBusquedaCliente&#39;)
                         $scope.select(cliente, true);
                     });
             };
-            
+
             function crearCopia(){
                 var cliente = angular.copy($scope.cliente);
  
@@ -633,20 +633,15 @@ angular.module(&#39;focaBusquedaCliente&#39;)
                     $scope.selectedClientes = 0;
                 }
             }
-            //
             function validateEmails(emails) {
                 var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
                 var arr = emails.split(',');
                 var result = true;
-    
                 arr.forEach(function(email) {
                     var val = String(email).trim().toLowerCase();
-    
                     if (!re.test(val)) result = false;
                 });
-    
                 return result;
             }
-            
         }
     ]);
@@ -408,7 +408,7 @@
                             <input 
                                 type="text"
                                 class="form-control form-control-sm col-2"
-                                maxlength="2"
+                                limite-numeros-max="2"
                                 ng-model="cliente.cuit1"
                                 ng-required="true"
                                 ng-keypress="pasarCampoCuit(1)"
@@ -421,6 +421,7 @@
                                 type="text"
                                 class="form-control form-control-sm col-5"
                                 maxlength="8"
+                                limite-numeros-max="8"
                                 ng-keypress="pasarCampoCuit(2)"
                                 ng-model="cliente.cuit2"
                                 ng-required="true"
@@ -433,6 +434,7 @@
                                 type="text"
                                 class="form-control form-control-sm col-2"
                                 maxlength="1"
+                                limite-numeros-max="1"
                                 ng-keypress="pasarCampoCuit(3)"
                                 ng-model="cliente.cuit3"
                                 ng-required="true"
...	...	@@ -538,7 +538,7 @@ angular.module('focaBusquedaCliente')
538	538	$scope.select(cliente, true);
539	539	});
540	540	};
541		-
	541	+
542	542	function crearCopia(){
543	543	var cliente = angular.copy($scope.cliente);
544	544
...	...	@@ -633,20 +633,15 @@ angular.module('focaBusquedaCliente')
633	633	$scope.selectedClientes = 0;
634	634	}
635	635	}
636		- //
637	636	function validateEmails(emails) {
638	637	var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)\|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])\|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
639	638	var arr = emails.split(',');
640	639	var result = true;
641		-
642	640	arr.forEach(function(email) {
643	641	var val = String(email).trim().toLowerCase();
644		-
645	642	if (!re.test(val)) result = false;
646	643	});
647		-
648	644	return result;
649	645	}
650		-
651	646	}
652	647	]);
...	...	@@ -408,7 +408,7 @@
408	408	<input
409	409	type="text"
410	410	class="form-control form-control-sm col-2"
411		- maxlength="2"
	411	+ limite-numeros-max="2"
412	412	ng-model="cliente.cuit1"
413	413	ng-required="true"
414	414	ng-keypress="pasarCampoCuit(1)"
...	...	@@ -421,6 +421,7 @@
421	421	type="text"
422	422	class="form-control form-control-sm col-5"
423	423	maxlength="8"
	424	+ limite-numeros-max="8"
424	425	ng-keypress="pasarCampoCuit(2)"
425	426	ng-model="cliente.cuit2"
426	427	ng-required="true"
...	...	@@ -433,6 +434,7 @@
433	434	type="text"
434	435	class="form-control form-control-sm col-2"
435	436	maxlength="1"
	437	+ limite-numeros-max="1"
436	438	ng-keypress="pasarCampoCuit(3)"
437	439	ng-model="cliente.cuit3"
438	440	ng-required="true"