From 509d5cea14c8912dde579cf1f663ef77687016f4 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 30 Jan 2024 15:54:03 +0100
Subject: [PATCH] refs #6270 fix back

---
 .../ticket/back/methods/ticket/makeInvoice.js | 26 +++++++++++++------
 modules/ticket/front/descriptor-menu/index.js | 23 +---------------
 .../invoice-electronic/invoice-electronic.js  |  2 +-
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js
index 1fcbd4130..706da6f39 100644
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@@ -108,16 +108,26 @@ module.exports = function(Self) {
 
             await Self.rawSql('CALL invoiceOutBooking(?)', [resultInvoice.id], myOptions);
 
+            const client = await models.Client.findById(clientId,
+                {fields: ['hasElectronicInvoice', 'name', 'email']}, myOptions);
+            if (client.hasElectronicInvoice) {
+                const url = await models.Url.getUrl();
+                await models.NotificationQueue.create({
+                    notificationFk: 'invoice-electronic',
+                    authorFk: client.id,
+                    params: JSON.stringify(
+                        {
+                            'name': client.name,
+                            'email': client.email,
+                            'ticketId': ticketsIds.join(','),
+                            'url': url + 'ticket/index?q=' + encodeURIComponent(JSON.stringify({clientFk: clientId}))
+                        })
+                }, myOptions);
+            }
+
             if (tx) await tx.commit();
 
-            const notificationInfo = {
-                clientName: firstTicket.clientFk.name,
-                clientEmail: firstTicket.clientFk.email,
-                ticketId: resultInvoice.id,
-                url: ctx.req.headers.referer
-            };
-
-            return {invoiceId: resultInvoice.id, notificationInfo};
+            return resultInvoice.id;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index 4e33d2c43..c254900cc 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -250,28 +250,7 @@ class Controller extends Section {
 
         return this.$http.post(`Tickets/invoiceTickets`, {ticketsIds: [this.id]})
             .then(() => this.reload())
-            .then(() => {
-                const client = this.ticket.client;
-
-                if (client.hasElectronicInvoice) {
-                    const notificationData = {
-                        name: client.name,
-                        email: client.email,
-                        ticketId: this.id,
-                        url: window.location.href
-                    };
-
-                    this.$http.post(`NotificationQueues`, {
-                        notificationFk: 'invoice-electronic',
-                        authorFk: client.id,
-                        params: JSON.stringify(notificationData)
-                    }).then(() => {
-                        this.vnApp.showSuccess(this.$t('Invoice sent'));
-                    });
-                }
-
-                this.vnApp.showSuccess(this.$t('Ticket invoiced'));
-            });
+            .then(() => this.vnApp.showSuccess(this.$t('Ticket invoiced')));
     }
 
     createPdfInvoice() {
diff --git a/print/templates/email/invoice-electronic/invoice-electronic.js b/print/templates/email/invoice-electronic/invoice-electronic.js
index 2e1e739ac..1ec6d1374 100644
--- a/print/templates/email/invoice-electronic/invoice-electronic.js
+++ b/print/templates/email/invoice-electronic/invoice-electronic.js
@@ -10,7 +10,7 @@ module.exports = {
             required: true
         },
         ticketId: {
-            type: [Number],
+            type: [String],
             required: true
         },
         url: {