diff --git a/helpers/mail.helper.js b/helpers/mail.helper.js index 1546c65..81ccdb1 100644 --- a/helpers/mail.helper.js +++ b/helpers/mail.helper.js @@ -103,7 +103,7 @@ function send(header, body) { "descriptionEntrada": values.descriptionEntrada, "qrCode": values.qrCode, "qrCodeUrl": values.qrCodeUrl, - "IDqrCode": "cid:id1", + //"IDqrCode": "cid:id1", "codeTicket": values.codeTicket, "eventName": values.eventName, "dateEvent": values.dateEvent, @@ -112,7 +112,7 @@ function send(header, body) { "nameInscription": header.name, }, - "InlinedAttachments": [ + /*"InlinedAttachments": [ { "ContentType": "image/png", "Filename": "qr.png", @@ -120,10 +120,12 @@ function send(header, body) { "Content-Disposition": "inline", "Base64Content": values.qrCode.substr(22) //Quitamos la cabecera para quedarnos solo con la imagen }, - ], + ],*/ }; + console.log(body.Variables); + return send(header, body); }; diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index 9dce2fb..e901f0f 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -46,8 +46,11 @@ function generateMemberInscription (user, inscription, reservation) { userId: user.id, qrConfig: null, qrCode: null, - } + + memberInscription.qrConfig = generateQRConfig(memberInscription); + memberInscription.qrCode = await QRHelper.getInscriptionQRCode(memberInscription.qrConfig); + memberInscription.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); } return memberInscription; @@ -276,9 +279,9 @@ console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>await QRHelper.getInscriptionQRCode(member.qrConfig); >>>>>>>> ', member); emailHelper.sendTicket(generateHeaderMail(member), generateBodyMail(member)) } catch (error) { @@ -362,9 +365,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); */ let headerMail = generateHeaderMail(member); headerMail.subject = 'Cancelación de ' + headerMail.subject; @@ -653,8 +656,9 @@ console.log('No se ha podido actualizar el aforo del evento'); }; - 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); @@ -687,8 +691,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); */ return handleResultResponse(member.qrCode, null, params, res, httpStatus.OK); @@ -734,8 +739,8 @@ 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);*/ console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); //console.log(headerMail, bodyMail); @@ -787,9 +792,6 @@ 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');