Commit 5c2dce4a90a501e3d8f5b9ec4915f7aa7b92ed0d
Exists in
master
conflics
Showing
1 changed file
Show diff stats
src/js/controller.js
| 1 | 1 | angular.module('focaBusquedaCliente') |
| 2 | 2 | .controller('focaBusquedaClienteModalController', [ |
| 3 | 3 | '$uibModalInstance', 'focaBusquedaClienteService', '$scope', '$filter', |
| 4 | - '$uibModal', 'focaModalService', '$timeout', '$rootScope', 'vendedor', 'cobrador', | |
| 4 | + '$uibModal', 'focaModalService', '$timeout', '$rootScope', | |
| 5 | + 'vendedor', 'cobrador', 'searchText', | |
| 5 | 6 | function ($uibModalInstance, focaBusquedaClienteService, $scope, $filter, |
| 6 | - $uibModal, focaModalService, $timeout, $rootScope, vendedor, cobrador) { | |
| 7 | + $uibModal, focaModalService, $timeout, $rootScope, | |
| 8 | + vendedor, cobrador, searchText) { | |
| 7 | 9 | |
| 8 | 10 | $scope.cobrador = cobrador ? cobrador : {}; |
| 9 | 11 | $scope.vendedor = vendedor ? vendedor : {}; |
| 10 | - $scope.filters = ''; | |
| 12 | + $scope.filters = searchText ? searchText : ''; | |
| 11 | 13 | $scope.primerBusqueda = false; |
| 12 | 14 | |
| 13 | 15 | //#region pagination |
| ... | ... | @@ -179,7 +181,7 @@ angular.module('focaBusquedaCliente') |
| 179 | 181 | $scope.accion = "Editar Cliente"; |
| 180 | 182 | $scope.ingreso = true; |
| 181 | 183 | }) |
| 182 | - .catch(function (e) { console.log(e); }) | |
| 184 | + .catch(function (e) { console.log(e); }); | |
| 183 | 185 | } |
| 184 | 186 | |
| 185 | 187 | $scope.busquedaDown = function (key) { |