Merge branch 'master' into 'master'

Master See merge request !34

Merge branch 'master' into 'master'
Master See merge request !34
Eric Fernandez
2 parents c53d0c7275 632d841531
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -67,8 +67,8 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
                 var cuerpos = [];
                 //TODO: habilitar edición
                 $scope.editando = false;
-                $scope.saveLoading = true;
-                for (var i = 0; i < $scope.facturaTabla.length; i++) {
+                focaBotoneraLateralService.startGuardar();
+                for(var i = 0; i < $scope.facturaTabla.length; i++) {
                     var cuerpoFactura = {
                         CYV: 'V',
                         TIP: 'C',
@@ -211,7 +211,7 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
                 };
                 focaCrearCobranzaService.guardarCobranza(cobranza).then(
                     function(result) {
-                        $scope.saveLoading = false;
+                        focaBotoneraLateralService.endGuardar(true);
                         focaModalService.alert('Cobranza guardada con éxito');
  
                         focaSeguimientoService.guardarPosicion(
@@ -238,7 +238,7 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
                         $scope.cobrosTabla = [];
                     }, function(error) {
                         focaModalService.alert('Hubo un problema al cargar la cobranza');
-                        $scope.saveLoading = false;
+                        focaBotoneraLateralService.endGuardar();
                         console.info(error);
                     }
                 );
...	...	@@ -67,8 +67,8 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
67	67	var cuerpos = [];
68	68	//TODO: habilitar edición
69	69	$scope.editando = false;
70		- $scope.saveLoading = true;
71		- for (var i = 0; i < $scope.facturaTabla.length; i++) {
	70	+ focaBotoneraLateralService.startGuardar();
	71	+ for(var i = 0; i < $scope.facturaTabla.length; i++) {
72	72	var cuerpoFactura = {
73	73	CYV: 'V',
74	74	TIP: 'C',
...	...	@@ -211,7 +211,7 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
211	211	};
212	212	focaCrearCobranzaService.guardarCobranza(cobranza).then(
213	213	function(result) {
214		- $scope.saveLoading = false;
	214	+ focaBotoneraLateralService.endGuardar(true);
215	215	focaModalService.alert('Cobranza guardada con éxito');
216	216
217	217	focaSeguimientoService.guardarPosicion(
...	...	@@ -238,7 +238,7 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
238	238	$scope.cobrosTabla = [];
239	239	}, function(error) {
240	240	focaModalService.alert('Hubo un problema al cargar la cobranza');
241		- $scope.saveLoading = false;
	241	+ focaBotoneraLateralService.endGuardar();
242	242	console.info(error);
243	243	}
244	244	);