From 4ebda1a06ffe0bdaf67bf4b1e5ea99a6383775e2 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 26 Sep 2024 14:06:45 +0200
Subject: [PATCH] feat: refs #7010 added filter fields to show packing type
 field in ticket list

---
 modules/ticket/back/methods/ticket/filter.js | 96 +++++++++++---------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index 06781c3c8..b72f224bf 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -228,52 +228,55 @@ module.exports = Self => {
         stmt = new ParameterizedSQL(`
             CREATE OR REPLACE TEMPORARY TABLE tmp.filter
                 (INDEX (id))
-                ENGINE = MEMORY
+                ENGINE = InnoDB
                     SELECT t.id,
-                        t.shipped,
-                        CAST(DATE(t.shipped) AS CHAR) shippedDate,
-                        HOUR(t.shipped) shippedHour,
-                        t.nickname,
-                        t.refFk,
-                        t.routeFk,
-                        t.warehouseFk,
-                        t.clientFk,
-                        t.totalWithoutVat,
-                        t.totalWithVat,
-                        io.id invoiceOutId,
-                        a.provinceFk,
-                        p.name province,
-                        w.name warehouse,
-                        am.name agencyMode,
-                        am.id agencyModeFk,
-                        st.name state,
-                        st.classColor,
-                        wk.lastName salesPerson,
-                        ts.stateFk stateFk,
-                        ts.alertLevel alertLevel,
-                        ts.code alertLevelCode,
-                        u.name userName,
-                        c.salesPersonFk,
-                        z.hour zoneLanding,
-                        HOUR(z.hour) zoneHour,
-                        MINUTE(z.hour) zoneMinute,
-                        z.name zoneName,
-                        z.id zoneFk,
-                        CAST(z.hour AS CHAR) hour,
-                        a.nickname addressNickname
-                    FROM ticket t
-                        LEFT JOIN invoiceOut io ON t.refFk = io.ref
-                        LEFT JOIN zone z ON z.id = t.zoneFk
-                        LEFT JOIN address a ON a.id = t.addressFk
-                        LEFT JOIN province p ON p.id = a.provinceFk
-                        LEFT JOIN warehouse w ON w.id = t.warehouseFk
-                        LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
-                        LEFT JOIN ticketState ts ON ts.ticketFk = t.id
-                        LEFT JOIN state st ON st.id = ts.stateFk
-                        LEFT JOIN client c ON c.id = t.clientFk
-                        LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                        LEFT JOIN account.user u ON u.id = wk.id
-                        LEFT JOIN route r ON r.id = t.routeFk
+                       t.shipped,
+                       CAST(DATE(t.shipped) AS CHAR) shippedDate,
+                       HOUR(t.shipped) shippedHour,
+                       t.nickname,
+                       t.refFk,
+                       t.routeFk,
+                       t.warehouseFk,
+                       t.clientFk,
+                       t.totalWithoutVat,
+                       t.totalWithVat,
+                       io.id invoiceOutId,
+                       a.provinceFk,
+                       p.name province,
+                       w.name warehouse,
+                       am.name agencyMode,
+                       am.id agencyModeFk,
+                       st.name state,
+                       st.classColor,
+                       wk.lastName salesPerson,
+                       ts.stateFk stateFk,
+                       ts.alertLevel alertLevel,
+                       ts.code alertLevelCode,
+                       u.name userName,
+                       c.salesPersonFk,
+                       z.hour zoneLanding,
+                       HOUR(z.hour) zoneHour,
+                       MINUTE(z.hour) zoneMinute,
+                       z.name zoneName,
+                       z.id zoneFk,
+                       CAST(z.hour AS CHAR) hour,
+                       a.nickname addressNickname,
+                      GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk SEPARATOR ', ') packing
+                   FROM ticket t
+                       LEFT JOIN invoiceOut io ON t.refFk = io.ref
+                       LEFT JOIN zone z ON z.id = t.zoneFk
+                       LEFT JOIN address a ON a.id = t.addressFk
+                       LEFT JOIN province p ON p.id = a.provinceFk
+                       LEFT JOIN warehouse w ON w.id = t.warehouseFk
+                       LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+                       LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+                       LEFT JOIN state st ON st.id = ts.stateFk
+                       LEFT JOIN client c ON c.id = t.clientFk
+                       LEFT JOIN worker wk ON wk.id = c.salesPersonFk
+                       LEFT JOIN account.user u ON u.id = wk.id
+                       LEFT JOIN route r ON r.id = t.routeFk
+                       LEFT JOIN sale s ON t.id = s.ticketFk
+                       LEFT JOIN item i ON i.id = s.itemFk
         `);
 
         if (args.orderFk) {
@@ -292,6 +295,9 @@ module.exports = Self => {
         }
 
         stmt.merge(conn.makeWhere(filter.where));
+        stmt.merge({
+            sql: `GROUP BY t.id`
+        });
         stmts.push(stmt);
 
         stmt = new ParameterizedSQL(`