From 4db6ddba543be136aaa5a76d6679bd45bb6b1802 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Wed, 19 Jan 2022 09:12:10 +0100
Subject: [PATCH] Updated closure queries

---
 print/methods/closure/closeAll.js      |  6 +-----
 print/methods/closure/closeByAgency.js | 14 +++++++++++++-
 print/methods/closure/closeByRoute.js  | 14 +++++++++++++-
 print/methods/closure/closeByTicket.js | 14 +++++++++++++-
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/print/methods/closure/closeAll.js b/print/methods/closure/closeAll.js
index 501203bce8..7af3676f26 100644
--- a/print/methods/closure/closeAll.js
+++ b/print/methods/closure/closeAll.js
@@ -14,7 +14,6 @@ module.exports = async function(request, response, next) {
         const tickets = await db.rawSql(`
             SELECT 
                 t.id,
-
                 t.clientFk,
                 c.name clientName,
                 c.email recipient,
@@ -28,14 +27,11 @@ module.exports = async function(request, response, next) {
                 JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
                 JOIN ticketState ts ON ts.ticketFk = t.id
                 JOIN alertLevel al ON al.id = ts.alertLevel
-
                 JOIN client c ON c.id = t.clientFk
                 JOIN province p ON p.id = c.provinceFk
                 JOIN country co ON co.id = p.countryFk
                 LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-
-
-            WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
+            WHERE al.code = 'PACKED'
                 AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY) 
                     AND util.dayEnd(?)
                 AND t.refFk IS NULL
diff --git a/print/methods/closure/closeByAgency.js b/print/methods/closure/closeByAgency.js
index aa5073a8a2..7807de23af 100644
--- a/print/methods/closure/closeByAgency.js
+++ b/print/methods/closure/closeByAgency.js
@@ -21,11 +21,23 @@ module.exports = async function(request, response, next) {
         const agencyIds = reqArgs.agencyModeId.split(',');
         const tickets = await db.rawSql(`
             SELECT 
-                t.id
+                t.id,
+                t.clientFk,
+                c.name clientName,
+                c.email recipient,
+                c.salesPersonFk,
+                c.isToBeMailed,
+                c.hasToInvoice,
+                co.hasDailyInvoice,
+                eu.email salesPersonEmail
             FROM expedition e
                 JOIN ticket t ON t.id = e.ticketFk
                 JOIN ticketState ts ON ts.ticketFk = t.id
                 JOIN alertLevel al ON al.id = ts.alertLevel
+                JOIN client c ON c.id = t.clientFk
+                JOIN province p ON p.id = c.provinceFk
+                JOIN country co ON co.id = p.countryFk
+                LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
             WHERE al.code = 'PACKED'
                 AND t.agencyModeFk IN(?) 
                 AND t.warehouseFk = ?
diff --git a/print/methods/closure/closeByRoute.js b/print/methods/closure/closeByRoute.js
index c91a1e2791..2c0bfd1eb7 100644
--- a/print/methods/closure/closeByRoute.js
+++ b/print/methods/closure/closeByRoute.js
@@ -15,11 +15,23 @@ module.exports = async function(request, response, next) {
 
         const tickets = await db.rawSql(`
             SELECT 
-                t.id
+                t.id,
+                t.clientFk,
+                c.name clientName,
+                c.email recipient,
+                c.salesPersonFk,
+                c.isToBeMailed,
+                c.hasToInvoice,
+                co.hasDailyInvoice,
+                eu.email salesPersonEmail
             FROM expedition e
                 JOIN ticket t ON t.id = e.ticketFk
                 JOIN ticketState ts ON ts.ticketFk = t.id
                 JOIN alertLevel al ON al.id = ts.alertLevel
+                JOIN client c ON c.id = t.clientFk
+                JOIN province p ON p.id = c.provinceFk
+                JOIN country co ON co.id = p.countryFk
+                LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
             WHERE al.code = 'PACKED'
                 AND t.routeFk = ?
                 AND t.refFk IS NULL
diff --git a/print/methods/closure/closeByTicket.js b/print/methods/closure/closeByTicket.js
index 31453be92f..c71b3ecd05 100644
--- a/print/methods/closure/closeByTicket.js
+++ b/print/methods/closure/closeByTicket.js
@@ -14,11 +14,23 @@ module.exports = async function(request, response, next) {
 
         const tickets = await db.rawSql(`
             SELECT 
-                t.id
+                t.id,
+                t.clientFk,
+                c.name clientName,
+                c.email recipient,
+                c.salesPersonFk,
+                c.isToBeMailed,
+                c.hasToInvoice,
+                co.hasDailyInvoice,
+                eu.email salesPersonEmail
             FROM expedition e
                 JOIN ticket t ON t.id = e.ticketFk
                 JOIN ticketState ts ON ts.ticketFk = t.id
                 JOIN alertLevel al ON al.id = ts.alertLevel
+                JOIN client c ON c.id = t.clientFk
+                JOIN province p ON p.id = c.provinceFk
+                JOIN country co ON co.id = p.countryFk
+                LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
             WHERE al.code = 'PACKED'
                 AND t.id = ?
                 AND t.refFk IS NULL