diff --git a/src/js/controller.js b/src/js/controller.js index fdd0b13..fa47390 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -35,9 +35,9 @@ angular.module('focaModal') $scope.parametros = parametros; $scope.fecha = new Date(); $scope.options = {}; - + if (parametros.minDate) $scope.options.minDate = parametros.minDate; - + $scope.cancelar = function() { $uibModalInstance.dismiss(); }; diff --git a/src/js/controllerMail.js b/src/js/controllerMail.js index 84a067e..85614c1 100644 --- a/src/js/controllerMail.js +++ b/src/js/controllerMail.js @@ -6,7 +6,7 @@ angular.module('focaModal') 'Blob', 'focaModalService', 'options', - function($scope, $uibModalInstance, FileSaver, Blob, + function ($scope, $uibModalInstance, FileSaver, Blob, focaModalService, options) { var regexMail = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; @@ -16,29 +16,39 @@ angular.module('focaModal') $scope.esperando = false; $scope.titulo = options.titulo; $scope.mailCliente = options.envio.mailCliente; + $scope.checkboxVar = false; - $scope.aceptar = function() { + $scope.aceptar = function () { $uibModalInstance.close(); }; - $scope.salir = function() { + $scope.salir = function () { $uibModalInstance.close($scope.descargado); }; - $scope.imprimir = function () { + $scope.validarImpresion = function () { + var rutaComprobante; + if ($scope.checkboxVar === true) { + rutaComprobante = options.descargaSinValorizar; + } else { + rutaComprobante = options.descarga; + } + imprimir(rutaComprobante); + } + imprimir = function (rutaComprobante) { $scope.descargado = true; $scope.esperando = true; focaModalService - .imprimirComprobante(options.descarga.url, options.options) - .then(function(res) { - var data = new Blob([res.data], {type: 'application/pdf'}); + .imprimirComprobante(rutaComprobante.url, options.options) + .then(function (res) { + var data = new Blob([res.data], { type: 'application/pdf' }); FileSaver.saveAs( data, - options.descarga.nombre + rutaComprobante.nombre ); $scope.esperando = false; }); }; - $scope.enviarCorreo = function(key) { + $scope.enviarCorreo = function (key) { if (key === 13) { if (!validarMail()) { focaModalService.alert('Ingrese email/s vĂ¡lido/s'); @@ -46,14 +56,14 @@ angular.module('focaModal') } $scope.descargado = true; $scope.esperando = true; - Object.assign(options.options, {receiver: $scope.mailCliente}); + Object.assign(options.options, { receiver: $scope.mailCliente }); focaModalService .enviarCorreo(options.envio.url, options.options) - .then(function() { + .then(function () { $scope.correoEnviado = true; $scope.esperando = false; - }, function() { + }, function () { $scope.esperando = false; $scope.correoNoEnviado = true; }); @@ -62,7 +72,7 @@ angular.module('focaModal') function validarMail() { var emails = $scope.mailCliente.split(','); var result = true; - emails.forEach(function(email) { + emails.forEach(function (email) { if (!regexMail.test(email.trim())) result = false; }); return result; diff --git a/src/js/service.js b/src/js/service.js index 11a91ed..b067d61 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -116,6 +116,7 @@ angular.module('focaModal') ); }, imprimirComprobante: function(url, options) { + console.log('imprimirComprobante', url, options); return $http.post( API_ENDPOINT.URL + url, options, @@ -123,6 +124,7 @@ angular.module('focaModal') ); }, enviarCorreo: function(url, options) { + console.log('enviarCorreo', url, options); return $http.post(API_ENDPOINT.URL + url, options); } }; diff --git a/src/views/modal-mail.html b/src/views/modal-mail.html index cd0f475..8bf9936 100644 --- a/src/views/modal-mail.html +++ b/src/views/modal-mail.html @@ -26,12 +26,24 @@
- - + +
+
+ + +
+ +