From dde393649bb6509b090c363ea32041ab8b6e0590 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Fri, 30 Aug 2019 19:56:28 +0200
Subject: [PATCH] a

---
 modules/events/event.controller.js            | 36 +++++++++++++++----
 modules/events/events_inscriptions.service.js |  2 +-
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js
index f809233..fad5f8a 100644
--- a/modules/events/event.controller.js
+++ b/modules/events/event.controller.js
@@ -518,23 +518,47 @@ console.log(headerMail, bodyMail);
         const inscriptionId = params.params.id;
         const userId = req.user.id;
         try {
-/*            
             const inscription = await eventInscriptionService._getInscriptionById(inscriptionId);
-            if (!inscription) {
+            if (!inscription) //{
                 return handleResultResponse("Inscription no encontrada", null, params, res, httpStatus.NOT_FOUND);
-            } else if (inscription.userId !== userId) {
-                return handleResultResponse("Inscription no encontrada", null, params, res, httpStatus.NOT_FOUND);
-            }
+//            } else if (inscription.userId !== userId) {
+//                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,
+                color: (inscription.reservation) ? inscription.reservation.color : null,
             }
             const qrCode = await QRHelper.getInscriptionQRCode(qrConfig);
+
+console.log('<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<', req.user);            
+            var headerMail = {
+                to: req.user.email,
+                name: req.user.name + ' ' + req.user.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);
+            if (member.validated)
+                emailHelper.sendTicket(headerMail, bodyMail)
+            else
+                emailHelper.sendListaEspera(headerMail, bodyMail);
+
 */
+
             return handleResultResponse(null, null, params, res, httpStatus.OK);
 
         } catch (error) {
diff --git a/modules/events/events_inscriptions.service.js b/modules/events/events_inscriptions.service.js
index b634ff1..87cfbcd 100644
--- a/modules/events/events_inscriptions.service.js
+++ b/modules/events/events_inscriptions.service.js
@@ -46,7 +46,7 @@ const extraMethods = {
     },
 
     _getInscriptionByEventAndUser: (eventId, userId) => {
-        return models.EventInscription.scope('includeEventAndVenue').findOne({
+        return models.EventInscription.scope(['includeEventAndVenue', 'includeReservation']).findOne({
             where: {
                 eventId: eventId,
                 userId: userId