Commit e180278ae0303440051a7a5a76876ff9b152d343
Exists in
master
and in
1 other branch
Merge branch 'master' into 'master'
Master See merge request !9
Showing
1 changed file
Show diff stats
src/js/controller.js
| ... | ... | @@ -9,9 +9,8 @@ angular.module('focaModalDomicilio') |
| 9 | 9 | '$uibModal', |
| 10 | 10 | 'idCliente', |
| 11 | 11 | 'esNuevo', |
| 12 | - 'articulos', | |
| 13 | 12 | function($timeout, $filter, $scope, $uibModalInstance, focaModalDomicilioService, |
| 14 | - $uibModal, idCliente, esNuevo, articulos) { | |
| 13 | + $uibModal, idCliente, esNuevo) { | |
| 15 | 14 | |
| 16 | 15 | $scope.buscar = function() { |
| 17 | 16 | focaModalDomicilioService |
| ... | ... | @@ -172,27 +171,8 @@ angular.module('focaModalDomicilio') |
| 172 | 171 | |
| 173 | 172 | $scope.verPuntosDescarga = function(key) { |
| 174 | 173 | |
| 175 | - var modalInstance = $uibModal.open( | |
| 176 | - { | |
| 177 | - ariaLabelledBy: 'Busqueda de Puntos de descarga', | |
| 178 | - templateUrl: 'modal-punto-descarga.html', | |
| 179 | - controller: 'focaModalPuntoDescargaController', | |
| 180 | - size: 'lg', | |
| 181 | - resolve: { | |
| 182 | - filters: { | |
| 183 | - idDomicilio: $scope.domicilios[key].id, | |
| 184 | - idCliente: idCliente, | |
| 185 | - articulos: articulos | |
| 186 | - } | |
| 187 | - } | |
| 188 | - } | |
| 189 | - ); | |
| 190 | - modalInstance.result.then(function(puntosDescarga) { | |
| 191 | - $scope.domicilios[key].puntosDescarga = puntosDescarga; | |
| 192 | - $scope.select($scope.domicilios[key]); | |
| 193 | - }, function() { | |
| 194 | - //TODO: función llamada cuando cancela el modal | |
| 195 | - }); | |
| 174 | + $scope.currentPageDomicilios[key].verPuntos = true; | |
| 175 | + $scope.select($scope.currentPageDomicilios[key]); | |
| 196 | 176 | }; |
| 197 | 177 | |
| 198 | 178 | $scope.localizarDomicilio = function(localizar) { |