From 0ffda978fef96e701dbc18821f48805778983746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s?= <nguarnieri@focasoftware.com>
Date: Fri, 22 Feb 2019 14:51:26 -0300
Subject: [PATCH] impresion y envio de correro

---
 src/js/controller.js            |  7 ++++++-
 src/js/controllerComprobante.js | 36 +++++++++++++++++++++---------------
 src/js/service.js               |  6 ++++--
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/js/controller.js b/src/js/controller.js
index 7f915b3..cf221e1 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -391,18 +391,21 @@ angular.module('focaCrearRemito') .controller('remitoController',
 
                         focaBotoneraLateralService.endGuardar(true);
                         $scope.saveLoading = false;
+                        
                         //TODO: updatear plazos
                         if($scope.remito.id === 0) {
+                            $scope.remito.id = data.data.id;
                             var plazos = $scope.plazosPagos;
 
                             for(var j = 0; j < plazos.length; j++) {
                                 var json = {
-                                    idRemito: data.data.id,
+                                    idRemito: $scope.remito.id,
                                     dias: plazos[j].dias
                                 };
                                 crearRemitoService.crearPlazosParaRemito(json);
                             }
                         }
+
                         $uibModal.open({
                             templateUrl: 'remito-comprobante.html',
                             controller: 'focaRemitoComprobanteController',
@@ -412,7 +415,9 @@ angular.module('focaCrearRemito') .controller('remitoController',
                                 }
                             }
                         });
+
                         init();
+
                     }, function(error) {
                         focaModalService.alert('Hubo un error al crear el remito');
                         focaBotoneraLateralService.endGuardar();
diff --git a/src/js/controllerComprobante.js b/src/js/controllerComprobante.js
index bbf0a3a..23cf393 100644
--- a/src/js/controllerComprobante.js
+++ b/src/js/controllerComprobante.js
@@ -4,29 +4,37 @@ angular.module('focaCrearRemito')
         '$uibModalInstance',
         'crearRemitoService',
         '$window',
+        '$filter',
         'parametros',
-        function($scope, $uibModalInstance, crearRemitoService, $window, parametros) {
-
+        'FileSaver',
+        'Blob',
+        function(
+            $scope, $uibModalInstance, crearRemitoService, $window, $filter,
+            parametros, FileSaver, Blob
+        ) {
             $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();
+                crearRemitoService.imprimirRemitoByIdRemito($scope.remito.id).then(
+                    function(res) {
+                        var data = new Blob([res.data], {type: 'application/pdf'});
+                        
+                        FileSaver.saveAs(
+                            data, 
+                            $filter('comprobante')([
+                                parametros.remito.sucursal, 
+                                parametros.remito.numeroRemito
+                            ]) + '.pdf'
+                        );
+                    }
+                );
             };
 
             $scope.enviarCorreo = function(key) {
@@ -34,9 +42,7 @@ angular.module('focaCrearRemito')
                 $scope.esperando = true;
                 var options = {
                     para: $scope.remito.cliente.MAIL,
-                    titulo: 'Recibo Mail',
-                    texto: '',
-                    html: $scope.htmlComprobante
+                    remito: $scope.remito.id
                 };
 
                 crearRemitoService.enviarCorreo(options).then(function() {
diff --git a/src/js/service.js b/src/js/service.js
index c869ae2..3ecbe43 100644
--- a/src/js/service.js
+++ b/src/js/service.js
@@ -58,14 +58,16 @@ angular.module('focaCrearRemito')
             },
             imprimirRemitoByIdRemito: function(idRemito, original) {
                 var tipo = original ? '/original' : '';
-                return $http.get(route + '/remito/comprobante/' + idRemito + tipo);
+                return $http.get(route + '/remito/comprobante/' + idRemito + tipo, {
+                    responseType: 'arraybuffer'
+                });
             },
             getPuntosDescargaByClienDom: function(idDomicilio, idCliente) {
                 return $http.get(API_ENDPOINT.URL + '/punto-descarga/' +
                     idDomicilio + '/' + idCliente);
             },
             enviarCorreo: function(options) {
-                return $http.post(API_ENDPOINT.URL + '/mail/enviar', options);
+                return $http.post(API_ENDPOINT.URL + '/remito/mail', options);
             },
             getBotonera: function() {
                 return [
-- 
1.9.1