verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 69 Releases Wiki Activity

4873-zone.delivery-day #1248

Merged
vicent merged 8 commits from 4873-zone.delivery-day into dev 2023-02-03 12:28:36 +00:00
Conversation 0 Commits 8 Files Changed 2 +24 -21
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f7969c616c - Show all commits

19
modules/zone/back/methods/zone/getZoneClosing.js
View File

@ -42,16 +42,19 @@ module.exports = Self => {
FROM vn.zone z FROM vn.zone z
JOIN vn.agencyMode am ON am.id = z.agencyModeFk JOIN vn.agencyMode am ON am.id = z.agencyModeFk
LEFT JOIN vn.zoneEvent ze ON ze.zoneFk = z.id LEFT JOIN vn.zoneEvent ze ON ze.zoneFk = z.id
WHERE WHERE ((
( ze.type = 'day'
ze.dated = ? AND ze.dated = ?
OR ? BETWEEN ze.started AND ze.ended ) OR (
OR ze.weekDays & (1 << WEEKDAY(?)) ze.type != 'day'
) AND ze.weekDays & (1 << WEEKDAY(?))
AND (ze.started IS NULL OR ? >= ze.started)
AND (ze.ended IS NULL OR ? <= ze.ended)
))
AND z.id IN (?) AND z.id IN (?)
ORDER BY type='day' DESC, type='range' DESC, type='indefinitely' DESC) z ORDER BY type='day' DESC, type='range' DESC, type='indefinitely' DESC) z
GROUP BY z.id;`; GROUP BY z.id`;
return Self.rawSql(query, [date, date, date, zoneIds], myOptions); return Self.rawSql(query, [date, date, date, date, zoneIds], myOptions);
}; };
}; };