Commit c5841810a1ea5c4f72bd8a5609d4ed4bc2352b2a
Exists in
master
and in
2 other branches
Merge branch 'master' into 'develop'
Master See merge request !25
Showing
1 changed file
Show diff stats
src/js/controller.js
| ... | ... | @@ -36,17 +36,28 @@ angular.module('focaModalDetalleCisternas') |
| 36 | 36 | |
| 37 | 37 | Promise.all([promesaVehiculo, promesaCisternas, promesaRemito]).then(function(res) { |
| 38 | 38 | if (idRemito !== -1 && !validarCargas(res[1].data, res[2].data)) { |
| 39 | - var alerta = focaModalService.alert('Los artículos del remito exceden la cantidad disponible del ' + | |
| 40 | - 'vehiculo'); | |
| 41 | - $uibModalInstance.dismiss(alerta); | |
| 39 | + focaModalService | |
| 40 | + .alert('Los artículos del remito exceden la capacidad disponible del ' + | |
| 41 | + 'vehiculo') | |
| 42 | + .then(function() { | |
| 43 | + $uibModalInstance.dismiss(); | |
| 44 | + }, function() { | |
| 45 | + $uibModalInstance.dismiss(); | |
| 46 | + }); | |
| 42 | 47 | return; |
| 43 | 48 | } |
| 49 | + | |
| 44 | 50 | $scope.cargandoDatos = false; |
| 45 | 51 | $scope.vehiculo = res[0].data; |
| 46 | 52 | $scope.cisternas = res[1].data; |
| 47 | 53 | |
| 48 | 54 | if(!$scope.cisternas.length) { |
| 49 | - $uibModalInstance.dismiss(focaModalService.alert('El vehículo no tiene cisternas')); | |
| 55 | + focaModalService.alert('El vehículo no tiene cisternas') | |
| 56 | + .then(function () { | |
| 57 | + $uibModalInstance.dismiss(); | |
| 58 | + }, function() { | |
| 59 | + $uibModalInstance.dismiss(); | |
| 60 | + }); | |
| 50 | 61 | return; |
| 51 | 62 | } |
| 52 | 63 |