From 1ab447a8426e1ba9a30e3f48f137e77f6c040d37 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 29 Nov 2019 13:23:37 +0100 Subject: [PATCH] . --- config/environments/production.js | 2 +- helpers/qr.helper.js | 10 ++++------ modules/events/event.controller.js | 31 +++++++++++++++--------------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/config/environments/production.js b/config/environments/production.js index 8366f30..6c6fe40 100644 --- a/config/environments/production.js +++ b/config/environments/production.js @@ -30,7 +30,7 @@ module.exports = { server: { hostname: process.env.HOSTNAME || '127.0.0.1', port: process.env.PORT || 18888, - public_url: "https://apiapp2.loquedeverdadimporta.org/api/v2/" + public_url: "https://apiapp2.loquedeverdadimporta.org/api/v2" }, cdn: { diff --git a/helpers/qr.helper.js b/helpers/qr.helper.js index d7748ad..664b01a 100644 --- a/helpers/qr.helper.js +++ b/helpers/qr.helper.js @@ -5,7 +5,7 @@ const moment = require('moment'); const config = require('../config'); module.exports.getInscriptionQRCodeUrl = function (inscriptionId) { - return encodeURI(`${config.server.public_url}/inscriptions/${inscriptionId}/qrimage`); + return encodeURI(`${config.server.public_url}/inscriptions/${inscriptionId}/qrimage`); } /* params = { @@ -17,8 +17,8 @@ module.exports.getInscriptionQRCodeUrl = function (inscriptionId) { } */ -module.exports.getInscriptionQRCode = async function (params) { - const result = new Promise(function (resolve, reject) { +module.exports.getInscriptionQRCode = function (params) { + return new Promise(function (resolve, reject) { var texto = _.padStart(params.code, 4, '0') + '\n' + moment(params.date).format('DD/MM/YY HH:mm ') + params.name + ' ' + params.surname; var options = { errorCorrectionLevel: 'M', @@ -45,9 +45,7 @@ module.exports.getInscriptionQRCode = async function (params) { resolve(qrcode); }); */ - }); - - return await result; + }) }; diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index e432824..5b45fc0 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -25,7 +25,7 @@ const userService = require('../auth/user.service'); const MODULE_NAME = '[event.controller]'; const controllerOptions = { MODULE_NAME }; -function generateMemberInscription (user, inscription, reservation) { +async function generateMemberInscription (user, inscription, reservation) { let memberInscription = null; if (user && inscription) { memberInscription = { @@ -47,10 +47,6 @@ function generateMemberInscription (user, inscription, reservation) { qrConfig: null, qrCode: null, } - - memberInscription.qrConfig = generateQRConfig(memberInscription); - memberInscription.qrCode = QRHelper.getInscriptionQRCode(memberInscription.qrConfig); - memberInscription.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); } return memberInscription; @@ -279,9 +275,9 @@ console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>await QRHelper.getInscriptionQRCode(member.qrConfig); >>>>>>>> ', member); emailHelper.sendTicket(generateHeaderMail(member), generateBodyMail(member)) } catch (error) { @@ -365,9 +361,9 @@ console.log('>>>>>>>>>>>>>> ', NewConfirmed); await eventInscriptionService._deleteMember(marketingListId, inscription.marketing_memberId); var member = generateMemberInscription(inscription.user, inscription, inscription.reservation); - /*member.qrConfig = generateQRConfig(member); + member.qrConfig = generateQRConfig(member); member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); - member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); */ + member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); let headerMail = generateHeaderMail(member); headerMail.subject = 'Cancelación de ' + headerMail.subject; @@ -656,9 +652,9 @@ console.log('No se ha podido actualizar el aforo del evento'); }; - /*member.qrConfig = generateQRConfig(member); + member.qrConfig = generateQRConfig(member); member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); - member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); */ + member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); //console.log(headerMail, bodyMail); @@ -691,9 +687,9 @@ console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); //Creamos objeto member para facilitar inserción en mailchimp y envio de correo var member = generateMemberInscription(req.user, inscription.inscription, inscription.reservation); - /*member.qrConfig = generateQRConfig(member); + member.qrConfig = generateQRConfig(member); member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); - member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); */ + member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); return handleResultResponse(member.qrCode, null, params, res, httpStatus.OK); @@ -739,8 +735,9 @@ console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); //Creamos objeto member para facilitar inserción en mailchimp y envio de correo var member = generateMemberInscription(userInscription, inscription, inscription.reservation); - /*member.qrConfig = generateQRConfig(member); - member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig);*/ + member.qrConfig = generateQRConfig(member); + member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); + member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); //console.log(headerMail, bodyMail); @@ -792,6 +789,10 @@ console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); //Creamos objeto member para facilitar inserción en mailchimp y envio de correo let member = generateMemberInscription(inscription.user, inscription, inscription.reservation); + member.qrConfig = generateQRConfig(member); + member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); + + let buffer = new Buffer(member.qrCode.split(",")[1], 'base64'); res.setHeader('Content-Type', 'image/png');