From a0a9e299d93e7adb778b2c021a8ef91477278510 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 22 Nov 2023 12:39:21 +0100
Subject: [PATCH] feat: refs #6275 getTickets with phone

---
 .../methods/route/getExpeditionSummary.js     | 40 +++++++++----------
 .../route/back/methods/route/getTickets.js    | 11 +++--
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/modules/route/back/methods/route/getExpeditionSummary.js b/modules/route/back/methods/route/getExpeditionSummary.js
index d35ab8611..ee89401a8 100644
--- a/modules/route/back/methods/route/getExpeditionSummary.js
+++ b/modules/route/back/methods/route/getExpeditionSummary.js
@@ -34,30 +34,30 @@ module.exports = Self => {
                     SUM(delivered) delivered,
                     GROUP_CONCAT(totalPacking ORDER BY total DESC SEPARATOR ' ') itemPackingType
                 FROM (
-                SELECT r.id AS routeFk,
-                        t.addressFk,
-                        CONCAT (IFNULL(e.itemPackingTypeFk,'-'), '', COUNT(*)) totalPacking,
-                        COUNT(*) total,
-                        SUM(est.code = 'ON DELIVERY') delivery,
-                        SUM(est.code = 'LOST') lost,
-                        SUM(est.code = 'DELIVERED') delivered,
-                        t.priority
-                FROM vn.ticket t
-                    JOIN vn.route r ON r.id = t.routeFk
-                    JOIN vn.expedition e ON e.ticketFk = t.id
-                    LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
-                    JOIN vn.agencyMode am ON am.id = r.agencyModeFk
-                    JOIN vn.agency ag ON ag.id = am.agencyFk
-                    LEFT JOIN vn.userConfig uc ON uc.userFk = account.myUser_getId()
-                WHERE (r.created = util.VN_CURDATE() OR r.created = TIMESTAMPADD(day,-1, util.VN_CURDATE()))
-                    AND t.routeFk = ?
-                GROUP BY t.addressFk, e.itemPackingTypeFk
-                ) sub
+                    SELECT r.id AS routeFk,
+                                t.addressFk,
+                                CONCAT (IFNULL(e.itemPackingTypeFk,'-'), '', COUNT(*)) totalPacking,
+                                COUNT(*) total,
+                                SUM(est.code = 'ON DELIVERY') delivery,
+                                SUM(est.code = 'LOST') lost,
+                                SUM(est.code = 'DELIVERED') delivered,
+                                t.priority
+                        FROM vn.ticket t
+                            JOIN vn.route r ON r.id = t.routeFk
+                            JOIN vn.expedition e ON e.ticketFk = t.id
+                            LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
+                            JOIN vn.agencyMode am ON am.id = r.agencyModeFk
+                            JOIN vn.agency ag ON ag.id = am.agencyFk
+                            LEFT JOIN vn.userConfig uc ON uc.userFk = account.myUser_getId()
+                        WHERE (r.created = util.VN_CURDATE() OR r.created = util.yesterday())
+                            AND t.routeFk = ?
+                        GROUP BY t.addressFk, e.itemPackingTypeFk
+                    ) sub
                 GROUP BY addressFk
                 ORDER BY priority DESC
       `;
 
-        const results = await Self.rawSql(query, [routeFk], options);
+        const results = await Self.rawSql(query, [routeFk], myOptions);
         return results;
     };
 };
diff --git a/modules/route/back/methods/route/getTickets.js b/modules/route/back/methods/route/getTickets.js
index 1eb9e27f5..8e1356a42 100644
--- a/modules/route/back/methods/route/getTickets.js
+++ b/modules/route/back/methods/route/getTickets.js
@@ -51,11 +51,16 @@ module.exports = Self => {
             u.nickname AS userNickname,
             vn.ticketTotalVolume(t.id) AS volume,
             tob.description,
-            GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt
+            GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt,
+            c.phone ClientPhone,
+            c.mobile ClientMobile,
+            a.phone AddressPhone,
+            a.mobile AddressMobile
         FROM vn.route r
             JOIN ticket t ON t.routeFk = r.id
-            JOIN vn.sale s ON s.ticketFk = t.id
-            JOIN vn.item i ON i.id = s.itemFk
+            JOIN client c ON t.clientFk = c.id
+            LEFT JOIN vn.sale s ON s.ticketFk = t.id
+            LEFT JOIN vn.item i ON i.id = s.itemFk
             LEFT JOIN ticketState ts ON ts.ticketFk = t.id
             LEFT JOIN state st ON st.id = ts.stateFk
             LEFT JOIN warehouse wh ON wh.id = t.warehouseFk