verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

#7648 - Filter entries by days #2722

Merged
jsegarra merged 12 commits from 7648_myEntries_filter into dev 2024-07-15 09:22:35 +00:00
Conversation 1 Commits 12 Files Changed 6 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 47cff3f894 - Show all commits

6
modules/entry/back/methods/entry/filter.js
View File

@ -189,8 +189,7 @@ module.exports = Self => {
t.landed, t.landed,
t.ref AS travelRef, t.ref AS travelRef,
t.warehouseInFk, t.warehouseInFk,
w.name warehouseInName, w.name warehouseInName
util.VN_CURDATE()
FROM vn.entry e FROM vn.entry e
JOIN vn.supplier s ON s.id = e.supplierFk JOIN vn.supplier s ON s.id = e.supplierFk
JOIN vn.travel t ON t.id = e.travelFk JOIN vn.travel t ON t.id = e.travelFk
@ -201,12 +200,13 @@ module.exports = Self => {
); );
if (supplier) { if (supplier) {
const days = ctx.args.days ?? DEFAULT_INTERVAL_DAYS;
stmt.merge({ stmt.merge({
sql: ` sql: `
AND t.shipped < util.VN_CURDATE() + INTERVAL ? + 1 DAY AND t.shipped < util.VN_CURDATE() + INTERVAL ? + 1 DAY
AND t.shipped >= util.VN_CURDATE() AND t.shipped >= util.VN_CURDATE()
`, `,
params: Array(1).fill(ctx.args.days ?? DEFAULT_INTERVAL_DAYS) params: [days]
}); });
} }
stmt.merge(conn.makeSuffix(filter)); stmt.merge(conn.makeSuffix(filter));