From f2225b49a71415bb977dc39e6d3bb9c523b8510d Mon Sep 17 00:00:00 2001 From: sergiodt Date: Mon, 29 Apr 2024 08:19:18 +0200 Subject: [PATCH 1/3] refs #6275 hotFix fix:getExpeditionSummary --- modules/route/back/methods/route/getExpeditionSummary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/route/back/methods/route/getExpeditionSummary.js b/modules/route/back/methods/route/getExpeditionSummary.js index ee89401a8..4f95ded2a 100644 --- a/modules/route/back/methods/route/getExpeditionSummary.js +++ b/modules/route/back/methods/route/getExpeditionSummary.js @@ -49,7 +49,7 @@ module.exports = Self => { 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()) + WHERE (r.created BETWEEN util.yesterday() AND util.VN_CURDATE() + INTERVAL 1 DAY) AND t.routeFk = ? GROUP BY t.addressFk, e.itemPackingTypeFk ) sub From f4767728bcdede8ed81fd56b9e27b7271572bcfb Mon Sep 17 00:00:00 2001 From: sergiodt Date: Mon, 29 Apr 2024 08:20:57 +0200 Subject: [PATCH 2/3] refs #6275 hotFix fix:getExpeditionSummary --- modules/route/back/methods/route/getExpeditionSummary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/route/back/methods/route/getExpeditionSummary.js b/modules/route/back/methods/route/getExpeditionSummary.js index 4f95ded2a..34f55feb2 100644 --- a/modules/route/back/methods/route/getExpeditionSummary.js +++ b/modules/route/back/methods/route/getExpeditionSummary.js @@ -49,7 +49,7 @@ module.exports = Self => { 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 BETWEEN util.yesterday() AND util.VN_CURDATE() + INTERVAL 1 DAY) + WHERE (r.created BETWEEN util.yesterday() AND util.VN_CURDATE() + INTERVAL 1 DAY) AND t.routeFk = ? GROUP BY t.addressFk, e.itemPackingTypeFk ) sub From a180f54390ebe454de3c9ed0b39d686c6170c58a Mon Sep 17 00:00:00 2001 From: sergiodt Date: Mon, 29 Apr 2024 08:59:12 +0200 Subject: [PATCH 3/3] refs #6275 hotFix fix:getExpeditionSummary --- modules/route/back/methods/route/getExpeditionSummary.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/route/back/methods/route/getExpeditionSummary.js b/modules/route/back/methods/route/getExpeditionSummary.js index 34f55feb2..2bd2ca43a 100644 --- a/modules/route/back/methods/route/getExpeditionSummary.js +++ b/modules/route/back/methods/route/getExpeditionSummary.js @@ -49,8 +49,7 @@ module.exports = Self => { 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 BETWEEN util.yesterday() AND util.VN_CURDATE() + INTERVAL 1 DAY) - AND t.routeFk = ? + WHERE t.routeFk = ? GROUP BY t.addressFk, e.itemPackingTypeFk ) sub GROUP BY addressFk