Merge branch 'master' into 'develop'

Master See merge request !32

Merge branch 'master' into 'develop'
Master See merge request !32
Eric Fernandez
2 parents e8d8095a98 1ca3799b06
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -283,9 +283,9 @@ angular.module(&#39;focaCrearHojaRuta&#39;) .controller(&#39;hojaRutaCtrl&#39;,
  
                         // remito.litros = litros;
                         // $scope.hojaRuta.litros = $scope.hojaRuta.litros + litros;
-                        $scope.cargarCisterna(remito.id).then(function() {
+                        $scope.cargarCisterna(remito.id).then(function(response) {
                             $scope.hojaRuta.remitosTabla.push(remito);
-                            $scope.seleccionarRemitos();
+                            if (!response) $scope.seleccionarRemitos();
                         }, function() {
                             $scope.seleccionarRemitos();
                         });
...	...	@@ -283,9 +283,9 @@ angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl',
283	283
284	284	// remito.litros = litros;
285	285	// $scope.hojaRuta.litros = $scope.hojaRuta.litros + litros;
286		- $scope.cargarCisterna(remito.id).then(function() {
	286	+ $scope.cargarCisterna(remito.id).then(function(response) {
287	287	$scope.hojaRuta.remitosTabla.push(remito);
288		- $scope.seleccionarRemitos();
	288	+ if (!response) $scope.seleccionarRemitos();
289	289	}, function() {
290	290	$scope.seleccionarRemitos();
291	291	});