diff --git a/src/js/controller.js b/src/js/controller.js index c6e4274..7f915b3 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -2,10 +2,9 @@ angular.module('focaCrearRemito') .controller('remitoController', [ '$scope', '$uibModal', '$location', '$filter', 'crearRemitoService', '$timeout', 'focaModalService', 'remitoBusinessService', '$rootScope', 'focaBotoneraLateralService', - '$window', function( $scope, $uibModal, $location, $filter, crearRemitoService, $timeout, focaModalService, - remitoBusinessService, $rootScope, focaBotoneraLateralService, $window) + remitoBusinessService, $rootScope, focaBotoneraLateralService) { config(); @@ -404,16 +403,15 @@ angular.module('focaCrearRemito') .controller('remitoController', crearRemitoService.crearPlazosParaRemito(json); } } - crearRemitoService.imprimirRemitoByIdRemito(data.data.id).then( - function(res) { - - var printWindow = $window.open('', '', 'height=1000,width=800'); - printWindow.document.write(res.data); - printWindow.document.close(); - printWindow.print(); - + $uibModal.open({ + templateUrl: 'remito-comprobante.html', + controller: 'focaRemitoComprobanteController', + resolve: { + parametros: { + remito: $scope.remito + } } - ); + }); init(); }, function(error) { focaModalService.alert('Hubo un error al crear el remito'); @@ -647,7 +645,8 @@ angular.module('focaCrearRemito') .controller('remitoController', $scope.remito.cliente = { COD: cliente.cod, CUIT: cliente.cuit, - NOM: cliente.nom + NOM: cliente.nom, + MAIL: cliente.mail }; diff --git a/src/js/controllerComprobante.js b/src/js/controllerComprobante.js new file mode 100644 index 0000000..fcbae66 --- /dev/null +++ b/src/js/controllerComprobante.js @@ -0,0 +1,51 @@ +angular.module('focaCrearRemito') + .controller('focaRemitoComprobanteController', [ + '$scope', + '$uibModalInstance', + 'crearRemitoService', + '$window', + 'parametros', + function($scope, $uibModalInstance, crearRemitoService, $window, parametros) { + + $scope.correoEnviado = false; + $scope.correoNoEnviado = false; + $scope.esperando = false; + $scope.remito = parametros.remito; + + crearRemitoService.imprimirRemitoByIdRemito($scope.remito.id).then( + function(res) { + $scope.htmlComprobante = res.data; + }); + + $scope.aceptar = function() { + $uibModalInstance.close(); + }; + + $scope.imprimir = function () { + + var printWindow = $window.open('', '', 'height=1000,width=800'); + printWindow.document.write($scope.htmlComprobante); + printWindow.document.close(); + printWindow.print(); + }; + + $scope.enviarCorreo = function(key) { + if(key !== 13) return; + $scope.esperando = true; + var options = { + para: $scope.remito.cliente.MAIL, + titulo: 'Recibo Mail', + texto: '', + html: $scope.htmlComprobante + }; + + crearRemitoService.enviarCorreo(options).then(function() { + $scope.correoEnviado = true; + $scope.esperando = false; + }, function() { + $scope.esperando = false; + $scope.correoNoEnviado = true; + }); + }; + } + ]); \ No newline at end of file diff --git a/src/js/service.js b/src/js/service.js index b14370d..c869ae2 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -64,6 +64,9 @@ angular.module('focaCrearRemito') return $http.get(API_ENDPOINT.URL + '/punto-descarga/' + idDomicilio + '/' + idCliente); }, + enviarCorreo: function(options) { + return $http.post(API_ENDPOINT.URL + '/mail/enviar', options); + }, getBotonera: function() { return [ { diff --git a/src/views/remito-comprobante.html b/src/views/remito-comprobante.html new file mode 100644 index 0000000..fac7cae --- /dev/null +++ b/src/views/remito-comprobante.html @@ -0,0 +1,42 @@ +