refs #6270 fix back

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 = {
+            return resultInvoice.id;
-                clientName: firstTicket.clientFk.name,
-                clientEmail: firstTicket.clientFk.email,
-                ticketId: resultInvoice.id,
-                url: ctx.req.headers.referer
-            };
-
-            return {invoiceId: resultInvoice.id, notificationInfo};
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

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(() => {
+            .then(() => this.vnApp.showSuccess(this.$t('Ticket invoiced')));
-                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'));
-            });
     }
 
     createPdfInvoice() {

print/templates/email/invoice-electronic/invoice-electronic.js

@@ -10,7 +10,7 @@ module.exports = {
             required: true
         },
         ticketId: {
-            type: [Number],
+            type: [String],
             required: true
         },
         url: {