Joel Vitelli / foca-crear-remito

Download as
Browse Code »

Commit 3c10ff75a3de2728f70a5940cb8611b58eaa2617

Authored by Eric Fernandez
1 parent 0267e3ada6
Exists in master and in 1 other branch develop

Modal para elegir opciones de comprobante

Showing 4 changed files with 107 additions and 12 deletions   Show diff stats
src/js/controller.js
Diff comments   View file @ 3c10ff7
... ... @@ -2,10 +2,9 @@ angular.module('focaCrearRemito') .controller('remitoController',
2 2 [
3 3 '$scope', '$uibModal', '$location', '$filter', 'crearRemitoService', '$timeout',
4 4 'focaModalService', 'remitoBusinessService', '$rootScope', 'focaBotoneraLateralService',
5   - '$window',
6 5 function(
7 6 $scope, $uibModal, $location, $filter, crearRemitoService, $timeout, focaModalService,
8   - remitoBusinessService, $rootScope, focaBotoneraLateralService, $window)
  7 + remitoBusinessService, $rootScope, focaBotoneraLateralService)
9 8 {
10 9 config();
11 10  
... ... @@ -404,16 +403,15 @@ angular.module('focaCrearRemito') .controller('remitoController',
404 403 crearRemitoService.crearPlazosParaRemito(json);
405 404 }
406 405 }
407   - crearRemitoService.imprimirRemitoByIdRemito(data.data.id).then(
408   - function(res) {
409   -
410   - var printWindow = $window.open('', '', 'height=1000,width=800');
411   - printWindow.document.write(res.data);
412   - printWindow.document.close();
413   - printWindow.print();
414   -
  406 + $uibModal.open({
  407 + templateUrl: 'remito-comprobante.html',
  408 + controller: 'focaRemitoComprobanteController',
  409 + resolve: {
  410 + parametros: {
  411 + remito: $scope.remito
  412 + }
415 413 }
416   - );
  414 + });
417 415 init();
418 416 }, function(error) {
419 417 focaModalService.alert('Hubo un error al crear el remito');
... ... @@ -647,7 +645,8 @@ angular.module('focaCrearRemito') .controller('remitoController',
647 645 $scope.remito.cliente = {
648 646 COD: cliente.cod,
649 647 CUIT: cliente.cuit,
650   - NOM: cliente.nom
  648 + NOM: cliente.nom,
  649 + MAIL: cliente.mail
651 650 };
652 651  
653 652  
src/js/controllerComprobante.js
Diff comments   View file @ 3c10ff7
... ... @@ -0,0 +1,51 @@
  1 +angular.module('focaCrearRemito')
  2 + .controller('focaRemitoComprobanteController', [
  3 + '$scope',
  4 + '$uibModalInstance',
  5 + 'crearRemitoService',
  6 + '$window',
  7 + 'parametros',
  8 + function($scope, $uibModalInstance, crearRemitoService, $window, parametros) {
  9 +
  10 + $scope.correoEnviado = false;
  11 + $scope.correoNoEnviado = false;
  12 + $scope.esperando = false;
  13 + $scope.remito = parametros.remito;
  14 +
  15 + crearRemitoService.imprimirRemitoByIdRemito($scope.remito.id).then(
  16 + function(res) {
  17 + $scope.htmlComprobante = res.data;
  18 + });
  19 +
  20 + $scope.aceptar = function() {
  21 + $uibModalInstance.close();
  22 + };
  23 +
  24 + $scope.imprimir = function () {
  25 +
  26 + var printWindow = $window.open('', '', 'height=1000,width=800');
  27 + printWindow.document.write($scope.htmlComprobante);
  28 + printWindow.document.close();
  29 + printWindow.print();
  30 + };
  31 +
  32 + $scope.enviarCorreo = function(key) {
  33 + if(key !== 13) return;
  34 + $scope.esperando = true;
  35 + var options = {
  36 + para: $scope.remito.cliente.MAIL,
  37 + titulo: 'Recibo Mail',
  38 + texto: '',
  39 + html: $scope.htmlComprobante
  40 + };
  41 +
  42 + crearRemitoService.enviarCorreo(options).then(function() {
  43 + $scope.correoEnviado = true;
  44 + $scope.esperando = false;
  45 + }, function() {
  46 + $scope.esperando = false;
  47 + $scope.correoNoEnviado = true;
  48 + });
  49 + };
  50 + }
  51 + ]);
0 52 \ No newline at end of file
... ... @@ -64,6 +64,9 @@ angular.module('focaCrearRemito')
64 64 return $http.get(API_ENDPOINT.URL + '/punto-descarga/' +
65 65 idDomicilio + '/' + idCliente);
66 66 },
  67 + enviarCorreo: function(options) {
  68 + return $http.post(API_ENDPOINT.URL + '/mail/enviar', options);
  69 + },
67 70 getBotonera: function() {
68 71 return [
69 72 {
src/views/remito-comprobante.html
Diff comments   View file @ 3c10ff7
... ... @@ -0,0 +1,42 @@
  1 +<div class="modal-header">
  2 + <h5>Comprobante de remito Nº
  3 + <span
  4 + ng-bind="[remito.numeroRemito, remito.sucursal] | comprobante">
  5 + </span>
  6 + </h5>
  7 +</div>
  8 +<div class="modal-body">
  9 + <div class="col-12">
  10 + <label
  11 + class="col-12 bg-success text-white"
  12 + ng-show="correoEnviado">Correo enviado con éxito</label>
  13 + <label
  14 + class="col-12 bg-danger text-white"
  15 + ng-show="correoNoEnviado">Hubo un error al enviar el correo</label>
  16 + <label>Enviar correo a </label>
  17 + <input
  18 + class="form-control"
  19 + ng-model="remito.cliente.MAIL"
  20 + ng-click="enviarCorreo($event.keyCode)"/>
  21 + </div>
  22 +</div>
  23 +<div class="modal-footer">
  24 + <button
  25 + type="button"
  26 + class="btn btn-info"
  27 + ng-click="imprimir()"
  28 + ladda="esperando"
  29 + >Imprimir</button>
  30 + <button
  31 + type="button"
  32 + class="btn btn-primary"
  33 + ng-click="aceptar()"
  34 + ladda="esperando"
  35 + >Aceptar</button>
  36 + <button
  37 + type="button"
  38 + class="btn btn-primary"
  39 + ng-click="enviarCorreo(13)"
  40 + ladda="esperando"
  41 + >Enviar</button>
  42 +</div>
0 43 \ No newline at end of file