a

modules/events/event.controller.js

@@ -31,9 +31,10 @@ function generateMemberInscription (user, inscription, reservation) {
                                 name: user.name,
                                 surname: user.surname,
                                 source: inscription.source,
-                                eventName: (inscription.event) ? inscription.event.name : 'N/A',
+                                event_name: (inscription.event) ? inscription.event.name : 'N/A',
+                                event_date: (inscription.event) ? inscription.event.init_date : 'N/A',
                                 reservation_code: (reservation) ? reservation.reservation_code : null,
-                                date: inscription.date,
+                                date_inscription: inscription.date,
                                 code_ticket: inscription.code_ticket,
                                 validated: inscription.validated,
                                 color: (reservation) ? reservation.color : null,
@@ -55,7 +56,7 @@ function generateQRConfig (member) {
         qrConfig = {
             name: member.name,
             surname: member.surname,
-            date: member.date,
+            date: member.date_inscription,
             code: member.code_ticket,
             color: member.color,
         };
@@ -70,7 +71,7 @@ function generateHeaderMail (member) {
         headerMail = {
             to: member.email,
             name: member.name + ' ' + member.surname,
-            subject: ((member.validated) ? 'Entrada' : 'Lista de espera') + ' para el congreso ' + member.eventName + ' confirmada'
+            subject: ((member.validated) ? 'Entrada' : 'Lista de espera') + ' para el congreso ' + member.event_name + ' confirmada'
             };
     };
 
@@ -86,14 +87,13 @@ function generateBodyMail (member) {
             qrCode: member.qrCode,
             color: member.qrConfig.color,
             codeTicket: member.code_ticket,
-            eventName: member.eventName,
+            eventName: member.event_name,
-            dateInscription: moment(member.date).format('D [de] MMMM [de] YYYY'),
+            dateInscription: moment(member.event_date).format('D [de] MMMM [de] YYYY'),
         };
     }
     return bodyMail;
 };
 
-
 const extraControllers = {
 
     checkReservationCode: async (req, res, next) => {
@@ -620,30 +620,10 @@ console.log('No se ha podido actualizar el aforo del evento');
         else 
             marketingListOfInscription = dataInscription.event.marketingList;
 */
-        var member2 = generateMemberInscription(dataUser.userResult.user, dataInscription.inscription, dataInscription.reservation);
-        member2.eventName = dataInscription.event.name;
         //Creamos objeto member para facilitar inserción en mailchimp y envio de correo
-        var member = {
+        var member = generateMemberInscription(dataUser.userResult.user, dataInscription.inscription, dataInscription.reservation);
-            marketing_memberId: null,
+        member.event_name = dataInscription.event.name;
-            email: dataUser.userResult.user.email,
+        member.event_date = dataInscription.event.init_date;        
-            name: dataUser.userResult.user.name,
-            surname: dataUser.userResult.user.surname,
-            source: dataInscription.inscription.source,
-            reservation_code: (dataInscription.reservation) ? dataInscription.reservation.reservation_code : null,
-            date: dataInscription.inscription.date,            
-            code_ticket: dataInscription.inscription.code_ticket,
-            validated: dataInscription.inscription.validated,
-            color: (dataInscription.reservation) ? dataInscription.reservation.color : null,
-            description: ((dataInscription.reservation) ? dataInscription.reservation.description : 'Entrada').toUpperCase(),
-            entity: (dataInscription.reservation) ? dataInscription.reservation.Entity.name : dataUser.userResult.user.entityId,
-            userId: dataUser.userResult.user.id
-        }
-
-console.log('member a añadir a mailchimp y envio correo');
-console.log(member);
-
-console.log('member a añadir a mailchimp y envio correo');
-console.log(member2);
 
         try
         {
@@ -654,64 +634,18 @@ console.log(member2);
         };
 
 
-        //MADAMOS MAIL CON LA ENTRADA
-        const qrConfig = {
-            name: member.name,
-            surname: member.surname,
-            date: member.date,
-            code: member.code_ticket,
-            color: member.color,
-        }
-        const qrCode = await QRHelper.getInscriptionQRCode(qrConfig);
-/*
-//        
-        member.qrConfig = generateQRConfig(member);
-        inscription.code_ticket_qr = await QRHelper.getInscriptionQRCode(member.qrConfig);
-
-        var member = generateMemberInscription(inscription.user, inscription, inscription.reservation);
-        console.log('generamos member>>>>>>>>>>>>>>>>>>>>> ', member);
-        //Eliminamos miembro de la lista de mailchimp a la que está asociado
-        await eventInscriptionService._deleteMember(marketingListIdOverflow, inscription.marketing_memberId);
-        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);        
         
-        console.log('mandar correo>>>>>>>>>>>>>>>>>>>>> ', member);
-        //Mandar correo de confirmacion de desinscripcion
-        try {
-            emailHelper.sendTicket(generateHeaderMail(member), generateBodyMail(member))
-        } catch (error) {
-            console.log('No se ha podido mandar email con entrada');
-        };
-*/
-
-        var headerMail = {
-            to: member.email,
-            name: member.name + ' ' + member.surname,
-            subject: ((member.validated) ? 'Entrada' : 'Lista de espera') + ' para el congreso ' + dataInscription.event.name + ' confirmada'
-        }
-
-        var bodyMail = {
-            tipoEntrada: (member.validated) ? 'Entrada' : 'Lista de espera',
-            descriptionEntrada: member.description,
-            qrCode: qrCode,
-            color: qrConfig.color,
-            codeTicket: member.code_ticket,
-            eventName: dataInscription.event.name,
-            dateInscription: moment(dataInscription.event.init_date).format('D [de] MMMM [de] YYYY'),
-        }
-
 console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>');        
 console.log(headerMail, bodyMail);
         
         try
         {
             if (member.validated)
-                emailHelper.sendTicket(headerMail, bodyMail)
+                emailHelper.sendTicket(generateHeaderMail(member), generateBodyMail(member))
             else
-                emailHelper.sendListaEspera(headerMail, bodyMail);
+                emailHelper.sendListaEspera(generateHeaderMail(member), generateBodyMail(member));
         } catch (error) {
             console.log('No se ha podido mandar email con entrada');
         };