From 060fc2ac21d7a4ca5467bdf296d76fcf865837fd Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 15 Mar 2021 11:07:44 +0100 Subject: [PATCH 1/3] Closure by date --- print/methods/closure.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/print/methods/closure.js b/print/methods/closure.js index 2a7ac19fb4..b7c2ac566f 100644 --- a/print/methods/closure.js +++ b/print/methods/closure.js @@ -6,6 +6,10 @@ const config = require('../core/config'); module.exports = app => { app.get('/api/closure/all', async function(req, res, next) { try { + const reqArgs = req.args; + if (!reqArgs.to) + throw new Error('The argument to is required'); + res.status(200).json({ message: 'Task executed successfully' }); @@ -19,9 +23,11 @@ module.exports = app => { JOIN ticketState ts ON ts.ticketFk = t.id JOIN alertLevel al ON al.alertLevel = ts.alertLevel WHERE al.code = 'PACKED' - AND DATE(t.shipped) BETWEEN DATE_ADD(CURDATE(), INTERVAL -2 DAY) AND CURDATE() + AND DATE(t.shipped) BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) AND :to AND t.refFk IS NULL - GROUP BY e.ticketFk`); + GROUP BY e.ticketFk`, { + to: reqArgs.to + }); const ticketIds = tickets.map(ticket => ticket.id); await closeAll(ticketIds, req.args); @@ -33,10 +39,12 @@ module.exports = app => { JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk JOIN zone z ON z.id = t.zoneFk SET t.routeFk = NULL - WHERE shipped BETWEEN CURDATE() AND util.dayEnd(CURDATE()) + WHERE shipped BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) AND util.dayEnd(:to) AND al.code NOT IN('DELIVERED','PACKED') AND t.routeFk - AND z.name LIKE '%MADRID%'`); + AND z.name LIKE '%MADRID%'`, { + to: reqArgs.to + }); } catch (error) { next(error); } From 893cca52cc2249e7ab8eebc0ce4730db2f32d2fd Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 15 Mar 2021 11:49:35 +0100 Subject: [PATCH 2/3] Changes --- print/methods/closure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/print/methods/closure.js b/print/methods/closure.js index b7c2ac566f..dc2fb4cac9 100644 --- a/print/methods/closure.js +++ b/print/methods/closure.js @@ -39,7 +39,7 @@ module.exports = app => { JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk JOIN zone z ON z.id = t.zoneFk SET t.routeFk = NULL - WHERE shipped BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) AND util.dayEnd(:to) + WHERE DATE(t.shipped) BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) AND :to AND al.code NOT IN('DELIVERED','PACKED') AND t.routeFk AND z.name LIKE '%MADRID%'`, { From 1acd5dc838069e1703ef2994c79b854ab8480ed9 Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 15 Mar 2021 12:03:19 +0100 Subject: [PATCH 3/3] Closure to dayEnd --- print/methods/closure.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/print/methods/closure.js b/print/methods/closure.js index dc2fb4cac9..e313699636 100644 --- a/print/methods/closure.js +++ b/print/methods/closure.js @@ -23,7 +23,8 @@ module.exports = app => { JOIN ticketState ts ON ts.ticketFk = t.id JOIN alertLevel al ON al.alertLevel = ts.alertLevel WHERE al.code = 'PACKED' - AND DATE(t.shipped) BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) AND :to + AND DATE(t.shipped) BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) + AND util.dayEnd(:to) AND t.refFk IS NULL GROUP BY e.ticketFk`, { to: reqArgs.to @@ -39,7 +40,8 @@ module.exports = app => { JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk JOIN zone z ON z.id = t.zoneFk SET t.routeFk = NULL - WHERE DATE(t.shipped) BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) AND :to + WHERE DATE(t.shipped) BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) + AND util.dayEnd(:to) AND al.code NOT IN('DELIVERED','PACKED') AND t.routeFk AND z.name LIKE '%MADRID%'`, { @@ -108,7 +110,8 @@ module.exports = app => { WHERE al.code = 'PACKED' AND t.agencyModeFk IN(:agencyModeId) AND t.warehouseFk = :warehouseId - AND DATE(t.shipped) BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) AND :to + AND DATE(t.shipped) BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) + AND util.dayEnd(:to) AND t.refFk IS NULL GROUP BY e.ticketFk`, { agencyModeId: agenciesId,