From 0bb7fa99fd64dc9c12f776f40fa483535f65362e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 2 Dec 2024 13:35:51 +0100
Subject: [PATCH] fix: refs #8222 fix pr

---
 modules/zone/back/methods/zone/deleteZone.js        |  2 +-
 .../zone/back/methods/zone/specs/deleteZone.spec.js | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/zone/back/methods/zone/deleteZone.js b/modules/zone/back/methods/zone/deleteZone.js
index 85303e46f6..e2e01a949d 100644
--- a/modules/zone/back/methods/zone/deleteZone.js
+++ b/modules/zone/back/methods/zone/deleteZone.js
@@ -51,7 +51,7 @@ module.exports = Self => {
             };
 
             const ticketList = await models.Ticket.find(filter, myOptions);
-            const hasRefFk = ticketList.some(ticket => ticket.refFk !== null && ticket.refFk !== undefined);
+            const hasRefFk = ticketList.some(ticket => ticket.refFk);
             if (hasRefFk)
                 throw new UserError('There are tickets to be invoiced');
 
diff --git a/modules/zone/back/methods/zone/specs/deleteZone.spec.js b/modules/zone/back/methods/zone/specs/deleteZone.spec.js
index d1e7579a28..510713f9e8 100644
--- a/modules/zone/back/methods/zone/specs/deleteZone.spec.js
+++ b/modules/zone/back/methods/zone/specs/deleteZone.spec.js
@@ -14,9 +14,11 @@ describe('zone deletezone()', () => {
         spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
             active: activeCtx
         });
+
+        const zoneId = 4;
         const originalTickets = await models.Ticket.find({
             where: {
-                zoneFk: 4
+                zoneFk: zoneId
             }
         });
         ticketIDs = originalTickets.map(ticket => ticket.id);
@@ -27,12 +29,12 @@ describe('zone deletezone()', () => {
 
     it('should delete a zone and update their tickets', async() => {
         const tx = await models.Zone.beginTransaction({});
-
+        const zoneId = 4;
         try {
             const options = {transaction: tx};
-            await models.Zone.deleteZone(ctx, 4, options);
+            await models.Zone.deleteZone(ctx, zoneId, options);
 
-            const updatedZone = await models.Zone.findById(4, null, options);
+            const updatedZone = await models.Zone.findById(zoneId, null, options);
 
             expect(updatedZone).toBeNull();
 
@@ -45,11 +47,12 @@ describe('zone deletezone()', () => {
 
     it('should not delete the zone if it has tickets', async() => {
         const tx = await models.Zone.beginTransaction({});
+        const zoneId = 1;
 
         let error;
         try {
             const options = {transaction: tx};
-            await models.Zone.deleteZone(ctx, 1, options);
+            await models.Zone.deleteZone(ctx, zoneId, options);
             await tx.rollback();
         } catch (e) {
             error = e.message;