Commit 4b93fedd7249975d086e2625df84ab0ac04eddc5
Exists in
master
and in
2 other branches
Merge branch 'develop' into 'master'
Develop See merge request !11
Showing
1 changed file
Show diff stats
src/js/controller.js
1 | 1 | angular.module('focaLogin') |
2 | 2 | .controller('focaLoginController', [ |
3 | - '$scope', 'focaLoginService', '$location', '$cookies', 'focaModalService', | |
4 | - function($scope, focaLoginService, $location, $cookies, focaModalService) { | |
3 | + '$scope', 'focaLoginService', '$location', '$cookies', 'focaModalService', 'md5', | |
4 | + function($scope, focaLoginService, $location, $cookies, focaModalService, md5) { | |
5 | 5 | $scope.paso = 1; |
6 | 6 | $scope.enviar = function() { |
7 | - focaLoginService.login($scope.usuario).then(function(datos) { | |
8 | - | |
7 | + focaLoginService.login({ | |
8 | + idUsuario: $scope.usuario.idUsuario, | |
9 | + clave: md5.createHash($scope.usuario.clave) | |
10 | + }).then(function(datos) { | |
9 | 11 | if (datos.data.chofer && datos.data.chofer.id) { |
10 | 12 | $cookies.put('chofer', datos.data.chofer.id); |
13 | + $cookies.put('nombreUsuario', datos.data.chofer.nombre); | |
11 | 14 | } else if (datos.data.vendedorCobrador && datos.data.vendedorCobrador.id) { |
12 | 15 | $cookies.put('vendedorCobrador', datos.data.vendedorCobrador.id); |
16 | + $cookies.put('nombreUsuario', datos.data.vendedorCobrador.NOM); | |
13 | 17 | } else { |
14 | 18 | focaModalService.alert('Existe un error con el usuario ingresado'); |
15 | 19 | return; |
... | ... | @@ -40,6 +44,7 @@ angular.module('focaLogin') |
40 | 44 | function($cookies, $location) { |
41 | 45 | $cookies.remove('chofer'); |
42 | 46 | $cookies.remove('vendedorCobrador'); |
47 | + $cookies.remove('nombreUsuario'); | |
43 | 48 | $cookies.remove('token'); |
44 | 49 | //Cierra ventana |
45 | 50 | window.open('', '_self', ''); //bug fix |