Merge branch 'master' into 'master'

Master See merge request !16

Merge branch 'master' into 'master'
Master See merge request !16
Eric Fernandez
2 parents f36df5ce2c 7424f270a7
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -56,12 +56,6 @@ angular.module(&#39;focaCrearRemito&#39;) .controller(&#39;remitoController&#39;,
                 focaBotoneraLateralService.addCustomButton('Salir', salir);
             });
  
-            crearRemitoService.getPrecioCondicion().then(
-                function(res) {
-                    $scope.precioCondiciones = res.data;
-                }
-            );
-
             crearRemitoService.getNumeroRemito().then(
                 function(res) {
                     $scope.puntoVenta = rellenar(res.data.sucursal, 4);
@@ -315,6 +309,7 @@ angular.module(&#39;focaCrearRemito&#39;) .controller(&#39;remitoController&#39;,
                     focaModalService.alert('Debe cargar al menos un articulo');
                     return;
                 }
+                focaBotoneraLateralService.startGuardar();
                 $scope.saveLoading = true;
                 var save =  {
                     remito: {
@@ -367,7 +362,7 @@ angular.module(&#39;focaCrearRemito&#39;) .controller(&#39;remitoController&#39;,
                         remitoBusinessService.addArticulos($scope.articulosTabla,
                             data.data.id, $scope.remito.cotizacion.COTIZACION);
  
-                        focaModalService.alert('Remito creado');
+                        focaBotoneraLateralService.endGuardar(true);
                         $scope.saveLoading = false;
                         //TODO: updatear plazos
                         if($scope.remito.id === 0) {
@@ -420,6 +415,7 @@ angular.module(&#39;focaCrearRemito&#39;) .controller(&#39;remitoController&#39;,
                         };
                     }, function(error) {
                         focaModalService.alert('Hubo un error al crear el remito');
+                        focaBotoneraLateralService.endGuardar();
                         $scope.saveLoading = false;
                         console.info(error);
                     }
...	...	@@ -56,12 +56,6 @@ angular.module('focaCrearRemito') .controller('remitoController',
56	56	focaBotoneraLateralService.addCustomButton('Salir', salir);
57	57	});
58	58
59		- crearRemitoService.getPrecioCondicion().then(
60		- function(res) {
61		- $scope.precioCondiciones = res.data;
62		- }
63		- );
64		-
65	59	crearRemitoService.getNumeroRemito().then(
66	60	function(res) {
67	61	$scope.puntoVenta = rellenar(res.data.sucursal, 4);
...	...	@@ -315,6 +309,7 @@ angular.module('focaCrearRemito') .controller('remitoController',
315	309	focaModalService.alert('Debe cargar al menos un articulo');
316	310	return;
317	311	}
	312	+ focaBotoneraLateralService.startGuardar();
318	313	$scope.saveLoading = true;
319	314	var save = {
320	315	remito: {
...	...	@@ -367,7 +362,7 @@ angular.module('focaCrearRemito') .controller('remitoController',
367	362	remitoBusinessService.addArticulos($scope.articulosTabla,
368	363	data.data.id, $scope.remito.cotizacion.COTIZACION);
369	364
370		- focaModalService.alert('Remito creado');
	365	+ focaBotoneraLateralService.endGuardar(true);
371	366	$scope.saveLoading = false;
372	367	//TODO: updatear plazos
373	368	if($scope.remito.id === 0) {
...	...	@@ -420,6 +415,7 @@ angular.module('focaCrearRemito') .controller('remitoController',
420	415	};
421	416	}, function(error) {
422	417	focaModalService.alert('Hubo un error al crear el remito');
	418	+ focaBotoneraLateralService.endGuardar();
423	419	$scope.saveLoading = false;
424	420	console.info(error);
425	421	}