Merge branch 'master' into 'master'

Master See merge request !26

Merge branch 'master' into 'master'
Master See merge request !26
Eric Fernandez
2 parents f5ff51fa8c 2674312b76
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -105,6 +105,7 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
                     return;
                 }
                 focaBotoneraLateralService.startGuardar();
+                $scope.saveLoading = true;
                 var notaPedido = {
                     id: $scope.notaPedido.id,
                     fechaCarga: $scope.now.toISOString().slice(0, 19).replace('T', ' '),
@@ -159,6 +160,7 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
                             $scope.notaPedido.vendedor.CodVen);
  
                         focaBotoneraLateralService.endGuardar(true);
+                        $scope.saveLoading = false;
                         $scope.$broadcast('cleanCabecera');
                         $scope.$broadcast('addCabecera', {
                             label: 'Moneda:',
@@ -200,6 +202,7 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
                     function(error) {
                         focaModalService.alert('Hubo un error al crear la nota de pedido');
                         focaBotoneraLateralService.endGuardar();
+                        $scope.saveLoading = false;
                         console.info(error);
                     }
                 );
...	...	@@ -105,6 +105,7 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
105	105	return;
106	106	}
107	107	focaBotoneraLateralService.startGuardar();
	108	+ $scope.saveLoading = true;
108	109	var notaPedido = {
109	110	id: $scope.notaPedido.id,
110	111	fechaCarga: $scope.now.toISOString().slice(0, 19).replace('T', ' '),
...	...	@@ -159,6 +160,7 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
159	160	$scope.notaPedido.vendedor.CodVen);
160	161
161	162	focaBotoneraLateralService.endGuardar(true);
	163	+ $scope.saveLoading = false;
162	164	$scope.$broadcast('cleanCabecera');
163	165	$scope.$broadcast('addCabecera', {
164	166	label: 'Moneda:',
...	...	@@ -200,6 +202,7 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
200	202	function(error) {
201	203	focaModalService.alert('Hubo un error al crear la nota de pedido');
202	204	focaBotoneraLateralService.endGuardar();
	205	+ $scope.saveLoading = false;
203	206	console.info(error);
204	207	}
205	208	);