Merge branch 'master' into 'develop'

Master See merge request !23

Merge branch 'master' into 'develop'
Master See merge request !23
Eric Fernandez
2 parents 5f57ee0dec ae792d6f27
Showing 2 changed files Show diff stats
src/js/controllerMail.js
src/js/service.js
@@ -4,11 +4,10 @@ angular.module(&#39;focaModal&#39;)
         '$uibModalInstance',
         'FileSaver',
         'Blob',
-        'focaModalEnviarMailService',
         'focaModalService',
         'options',
         function($scope, $uibModalInstance, FileSaver, Blob,
-            focaModalEnviarMailService, focaModalService, options) {
+            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,}))$/;
             $scope.descargado = false;
@@ -27,7 +26,7 @@ angular.module(&#39;focaModal&#39;)
             $scope.imprimir = function () {
                 $scope.descargado = true;
                 $scope.esperando = true;
-                focaModalEnviarMailService
+                focaModalService
                     .imprimirComprobante(options.descarga.url, options.options)
                     .then(function(res) {
                         var data = new Blob([res.data], {type: 'application/pdf'});
@@ -49,7 +48,7 @@ angular.module(&#39;focaModal&#39;)
                     $scope.esperando = true;
                     Object.assign(options.options, {receiver: $scope.mailCliente});
  
-                    focaModalEnviarMailService
+                    focaModalService
                         .enviarCorreo(options.envio.url, options.options)
                         .then(function() {
                             $scope.correoEnviado = true;
@@ -100,6 +100,16 @@ angular.module(&#39;focaModal&#39;)
                             return resultado;
                         }
                     );
+                },
+                imprimirComprobante: function(url, options) {
+                    return $http.post(
+                        API_ENDPOINT.URL + url,
+                        options,
+                        {responseType: 'arraybuffer'}
+                    );
+                },
+                enviarCorreo: function(url, options) {
+                    return $http.post(API_ENDPOINT.URL + url, options);
                 }
             };
         }
...	...	@@ -4,11 +4,10 @@ angular.module('focaModal')
4	4	'$uibModalInstance',
5	5	'FileSaver',
6	6	'Blob',
7		- 'focaModalEnviarMailService',
8	7	'focaModalService',
9	8	'options',
10	9	function($scope, $uibModalInstance, FileSaver, Blob,
11		- focaModalEnviarMailService, focaModalService, options) {
	10	+ focaModalService, options) {
12	11
13	12	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,}))$/;
14	13	$scope.descargado = false;
...	...	@@ -27,7 +26,7 @@ angular.module('focaModal')
27	26	$scope.imprimir = function () {
28	27	$scope.descargado = true;
29	28	$scope.esperando = true;
30		- focaModalEnviarMailService
	29	+ focaModalService
31	30	.imprimirComprobante(options.descarga.url, options.options)
32	31	.then(function(res) {
33	32	var data = new Blob([res.data], {type: 'application/pdf'});
...	...	@@ -49,7 +48,7 @@ angular.module('focaModal')
49	48	$scope.esperando = true;
50	49	Object.assign(options.options, {receiver: $scope.mailCliente});
51	50
52		- focaModalEnviarMailService
	51	+ focaModalService
53	52	.enviarCorreo(options.envio.url, options.options)
54	53	.then(function() {
55	54	$scope.correoEnviado = true;
...	...	@@ -100,6 +100,16 @@ angular.module('focaModal')
100	100	return resultado;
101	101	}
102	102	);
	103	+ },
	104	+ imprimirComprobante: function(url, options) {
	105	+ return $http.post(
	106	+ API_ENDPOINT.URL + url,
	107	+ options,
	108	+ {responseType: 'arraybuffer'}
	109	+ );
	110	+ },
	111	+ enviarCorreo: function(url, options) {
	112	+ return $http.post(API_ENDPOINT.URL + url, options);
103	113	}
104	114	};
105	115	}