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,