Merge branch 'master' into 'master'

Master See merge request !35

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