3676-zone_delivery-days #891

Merged
carlosjr merged 8 commits from 3676-zone_delivery-days into dev 2022-03-07 10:26:08 +00:00
Member
No description provided.
alexm added the
CR / Tests passed
label 2022-03-07 07:12:49 +00:00
alexm added 5 commits 2022-03-07 07:12:50 +00:00
gitea/salix/pipeline/head This commit looks good Details
a658969afa
feat(zone_delivery-days): get real closing hour
gitea/salix/pipeline/head This commit looks good Details
2c853a7885
test(zone): getZoneClosing() front and back
gitea/salix/pipeline/head This commit looks good Details
dedbccae19
description
gitea/salix/pipeline/head This commit looks good Details
b421038bbe
typo
alexm added 1 commit 2022-03-07 09:10:56 +00:00
gitea/salix/pipeline/head This commit looks good Details
a136d8b03d
accept array in params
carlosjr requested changes 2022-03-07 09:21:04 +00:00
@ -0,0 +3,4 @@
description: 'Get zone events filtered for date and prioritized by type',
accepts: [
{
arg: 'zonesId',
Contributor

zoneIds

zoneIds
alexm marked this conversation as resolved
@ -0,0 +5,4 @@
{
arg: 'zonesId',
type: ['number'],
description: 'The zones id',
Contributor

The zone identifiers or ids

The zone identifiers or ids
alexm marked this conversation as resolved
@ -0,0 +11,4 @@
{
arg: 'date',
type: 'date',
description: 'The date calendar',
Contributor

The calendar date

The calendar date
alexm marked this conversation as resolved
@ -0,0 +56,4 @@
OR ? BETWEEN started AND ended
OR INSTR(weekDays, SUBSTRING(DAYNAME(?), 1, 3) ) > 0
)
AND z.id IN (${paramsString})
Contributor

try not to use variables instead of "?" to prevent posible sql injections

try not to use variables instead of "?" to prevent posible sql injections
alexm marked this conversation as resolved
@ -0,0 +60,4 @@
ORDER BY type='day' DESC, type='range' DESC, type='indefinitely' DESC) z
GROUP BY z.id`;
return await Self.rawSql(query, paramsSql, myOptions);
Contributor

is the await needed or can return the promise?

is the await needed or can return the promise?
alexm marked this conversation as resolved
carlosjr removed the
CR / Tests passed
label 2022-03-07 09:21:14 +00:00
alexm added 1 commit 2022-03-07 09:29:06 +00:00
gitea/salix/pipeline/head This commit looks good Details
56bdb85af5
translations
alexm added the
CR / Tests passed
label 2022-03-07 09:29:24 +00:00
alexm requested review from carlosjr 2022-03-07 09:29:30 +00:00
alexm added 1 commit 2022-03-07 10:22:31 +00:00
gitea/salix/pipeline/head This commit looks good Details
0359e05def
description
carlosjr approved these changes 2022-03-07 10:24:31 +00:00
carlosjr left a comment
Contributor

LGTM

LGTM
carlosjr removed the
CR / Tests passed
label 2022-03-07 10:24:42 +00:00
carlosjr merged commit 76b63c8c45 into dev 2022-03-07 10:26:08 +00:00
carlosjr deleted branch 3676-zone_delivery-days 2022-03-07 10:26:08 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#891
No description provided.