diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index be9bf22..f8222fa 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -261,14 +261,12 @@ console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ', member); //Eliminamos miembro de la lista de mailchimp a la que está asociado - await eventInscriptionService._deleteMember(marketingListIdOverflow, inscription.marketing_memberId); + await eventInscriptionService._deleteMember(marketingListIdOverflow, inscription.marketing_memberId); + + var member = generateMemberInscription(inscription.user, inscription, inscription.reservation); member.marketing_memberId = await eventInscriptionService._addMember(marketingListIdEvent, member); eventInscriptionService._updateMarketingMemberOfInscription(inscription.id, member.marketing_memberId); - member.qrConfig = generateQRConfig(member); member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); @@ -341,10 +339,10 @@ console.log('>>>>>>>>>>>>>> ', NewConfirmed); } -//Desinscribimos de mailchimp y mandamos correo de confirmacion de desinscripcion + //Desinscribimos de mailchimp y mandamos correo de confirmacion de desinscripcion + await eventInscriptionService._deleteMember(marketingListId, inscription.marketing_memberId); + var member = generateMemberInscription(inscription.user, inscription, inscription.reservation); -console.log('generamos member para mailchimp y correo>>>>>>>>>>>>>>>>>>>>> ', member); - await eventInscriptionService._deleteMember(marketingListId, inscription.marketing_memberId); member.qrConfig = generateQRConfig(member); member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); @@ -623,6 +621,7 @@ console.log('No se ha podido actualizar el aforo del evento'); */ //Creamos objeto member para facilitar inserción en mailchimp y envio de correo var member = generateMemberInscription(dataUser.userResult.user, dataInscription.inscription, dataInscription.reservation); + //En este caso al ser una inscripcion recien creada hay que asignar los datos del evento desde el evento member.event_name = dataInscription.event.name; member.event_date = dataInscription.event.init_date; @@ -667,16 +666,12 @@ console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); return handleResultResponse("Inscription no encontrada", null, params, res, httpStatus.NOT_FOUND); } - const qrConfig = { - name: req.user.name, - surname: req.user.surname, - date: inscription.date, - code: inscription.code_ticket, - color: (inscription.level && inscription.level.color) ? inscription.level.color : null, - } - const qrCode = await QRHelper.getInscriptionQRCode(qrConfig); + //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.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); - return handleResultResponse(qrCode, null, params, res, httpStatus.OK); + return handleResultResponse(member.qrCode, null, params, res, httpStatus.OK); } catch (error) { return handleResultResponse("Error al buscar la inscripción", null, params, res, httpStatus.NOT_FOUND); @@ -719,8 +714,6 @@ 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.event_name = inscription.event.name; - member.event_date = inscription.event.init_date; member.qrConfig = generateQRConfig(member); member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig);