From 6fe52ba3e8efbe3203ad2f95250f54d8b944d341 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 22 Sep 2023 12:48:54 +0200
Subject: [PATCH 1/2] ref #6246 check sales and update test

---
 modules/ticket/back/methods/ticket/setDeleted.js       | 2 +-
 modules/ticket/back/methods/ticket/specs/merge.spec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js
index 2f8c402da..fcd9972fe 100644
--- a/modules/ticket/back/methods/ticket/setDeleted.js
+++ b/modules/ticket/back/methods/ticket/setDeleted.js
@@ -118,7 +118,7 @@ module.exports = Self => {
 
             // Send notification to salesPerson
             const salesPersonUser = ticket.client().salesPersonUser();
-            if (salesPersonUser) {
+            if (salesPersonUser && sales.length) {
                 const origin = ctx.req.headers.origin;
                 const message = $t(`I have deleted the ticket id`, {
                     id: id,
diff --git a/modules/ticket/back/methods/ticket/specs/merge.spec.js b/modules/ticket/back/methods/ticket/specs/merge.spec.js
index 3be6b8bac..560dac7ee 100644
--- a/modules/ticket/back/methods/ticket/specs/merge.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/merge.spec.js
@@ -34,7 +34,7 @@ describe('ticket merge()', () => {
         return value;
     };
 
-    it('should merge two tickets', async() => {
+    it('should merge a ticket', async() => {
         const tx = await models.Ticket.beginTransaction({});
 
         try {
@@ -49,7 +49,7 @@ describe('ticket merge()', () => {
 
             expect(deletedTicket.isDeleted).toEqual(true);
             expect(salesTicketFuture.length).toEqual(2);
-            expect(chatNotificationBeforeMerge.length).toEqual(chatNotificationAfterMerge.length - 2);
+            expect(chatNotificationBeforeMerge.length).toEqual(chatNotificationAfterMerge.length - 1);
 
             await tx.rollback();
         } catch (e) {

From db8dc8487b7ba76a507259a024c13a0f802b7b1f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 25 Sep 2023 15:28:08 +0200
Subject: [PATCH 2/2] ref #6246 replace name

---
 modules/ticket/back/methods/ticket/specs/merge.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/specs/merge.spec.js b/modules/ticket/back/methods/ticket/specs/merge.spec.js
index 560dac7ee..646b9739f 100644
--- a/modules/ticket/back/methods/ticket/specs/merge.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/merge.spec.js
@@ -34,7 +34,7 @@ describe('ticket merge()', () => {
         return value;
     };
 
-    it('should merge a ticket', async() => {
+    it('should merge two tickets', async() => {
         const tx = await models.Ticket.beginTransaction({});
 
         try {