From 77eedcbb42c99c48a54d91898975ec6405526b99 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 20 Sep 2019 18:25:10 +0200 Subject: [PATCH] a --- modules/events/event.controller.js | 129 ++++------------------------- 1 file changed, 16 insertions(+), 113 deletions(-) diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index 303f143..be9bf22 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -717,37 +717,24 @@ console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); const userInscription = await userService._getUserById(inscription.userId); - console.log(inscription); - const qrConfig = { - name: userInscription.name, - surname: userInscription.surname, - date: inscription.date, - code: inscription.code_ticket, - color: (inscription.reservation) ? inscription.reservation.color : null, - } - const qrCode = await QRHelper.getInscriptionQRCode(qrConfig); + //Creamos objeto member para facilitar inserción en mailchimp y envio de correo + var member = generateMemberInscription(userInscription, inscription, inscription.reservation); + member.event_name = inscription.event.name; + member.event_date = inscription.event.init_date; + member.qrConfig = generateQRConfig(member); + member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); - var headerMail = { - to: userInscription.email, - name: userInscription.name + ' ' + userInscription.surname, - subject: ((inscription.validated) ? 'Entrada' : 'Lista de espera') + ' para el congreso ' + inscription.event.name + ' confirmada' - } - - var bodyMail = { - tipoEntrada: (inscription.validated) ? 'Entrada' : 'Lista de espera', - descriptionEntrada: (inscription.reservation) ? inscription.reservation.description : 'Entrada', - qrCode: qrCode, - color: qrConfig.color, - codeTicket: inscription.code_ticket, - eventName: inscription.event.name, - dateInscription: moment(inscription.event.init_date).format('D [de] MMMM [de] YYYY'), - } console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); - console.log(headerMail, bodyMail); - if (inscription.validated) - emailHelper.sendTicket(headerMail, bodyMail) - else - emailHelper.sendListaEspera(headerMail, bodyMail); + //console.log(headerMail, bodyMail); + + try { + if (member.validated) + emailHelper.sendTicket(generateHeaderMail(member), generateBodyMail(member)) + else + emailHelper.sendListaEspera(generateHeaderMail(member), generateBodyMail(member)); + } catch (error) { + console.log('No se ha podido mandar email con entrada'); + }; return handleResultResponse(null, null, params, res, httpStatus.OK); @@ -756,90 +743,6 @@ console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); } }, -/* PENDENTE - //Envía entrada pasada por parametro, a petición del usuario pasado por parametro - _sendMailTicket: async (inscriptionId, user) => { - console.log('aaaaaaaaaaaaaaaaaaaaaaaa'); - var result = false; - - if (!inscriptionId) - return result; - - try { - - const inscription = _getInscriptionById(inscriptionId); - console.log('abbbbbbbbbbbbbbbbbbbb>> ', inscription); - if (!inscription) { - console.log('_sendMailTicket>>>>> Inscription no encontrada'); - return result; - }; - - if (user && user.level < 8) - if (inscription.userId !== user.id) { - console.log('_sendMailTicket>>>>> Usuario de solicitud no corresponde a administrador ni propietario de la Inscription'); - return result; - }; - - const userInscription = userService._getUserById(inscription.userId); - - console.log(inscription); - const qrConfig = { - name: userInscription.name, - surname: userInscription.surname, - date: inscription.date, - code: inscription.code_ticket, - color: (inscription.reservation) ? inscription.reservation.color : null, - } - const qrCode = QRHelper.getInscriptionQRCode(qrConfig); - - var headerMail = { - to: userInscription.email, - name: userInscription.name + ' ' + userInscription.surname, - subject: ((inscription.validated) ? 'Entrada' : 'Lista de espera') + ' para el congreso ' + inscription.event.name + ' confirmada' - } - - var bodyMail = { - tipoEntrada: (inscription.validated) ? 'Entrada' : 'Lista de espera', - descriptionEntrada: (inscription.reservation) ? inscription.reservation.description : 'Entrada', - qrCode: qrCode, - color: qrConfig.color, - codeTicket: inscription.code_ticket, - eventName: inscription.event.name, - dateInscription: moment(inscription.event.init_date).format('D [de] MMMM [de] YYYY'), - } - console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); - console.log(headerMail, bodyMail); - if (inscription.validated) - emailHelper.sendTicket(headerMail, bodyMail) - else - emailHelper.sendListaEspera(headerMail, bodyMail); - - return true; - - } catch (error) { - return false; //handleResultResponse("Error al buscar la inscripción", null, params, res, httpStatus.NOT_FOUND); - } - - }, - - sendMailTicket: async (req, res, next) => { - const params = extractParamsFromRequest(req, res, {}); - const inscriptionId = params.params.id; - const user = req.user; - try { - console.log('aaaaaaaaaaaaaa>> ', inscriptionId); - const aaaa = await _sendMailTicket(inscriptionId, user); - if (aaaa) - return handleResultResponse(null, null, params, res, httpStatus.OK) - else - return handleResultResponse("Inscription no encontrada", null, params, res, httpStatus.NOT_FOUND); - - } catch (error) { - return handleResultResponse("Error al buscar la inscripción", null, params, res, httpStatus.NOT_FOUND); - } - }, -*/ - getReservationsExcel: async (req, res, next) => { const params = extractParamsFromRequest(req, res, {}); const eventId = params.params.id;