From 27f66214477570dbce66507b1a5050fe997eb013 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Tue, 30 Jan 2024 13:29:49 +0100 Subject: [PATCH 1/3] refs #5802 feat:ticket_setState --- db/routines/vn/procedures/ticket_setState.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/routines/vn/procedures/ticket_setState.sql b/db/routines/vn/procedures/ticket_setState.sql index 13a93380d0..bd70275530 100644 --- a/db/routines/vn/procedures/ticket_setState.sql +++ b/db/routines/vn/procedures/ticket_setState.sql @@ -31,8 +31,8 @@ BEGIN CALL util.throw('ASSIGN_ZONE_FIRST'); END IF; - SET vCanChangeState = ( - vStateCode <> 'ON_CHECKING' OR + SET vCanChangeState = (( + vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR vticketAlertLevel < vPackedAlertLevel )AND NOT ( vTicketStateCode IN ('CHECKED', 'CHECKING') From a46c3c4d9572ad54417ecea2f2e54cf5b85fe25f Mon Sep 17 00:00:00 2001 From: sergiodt Date: Tue, 30 Jan 2024 13:31:17 +0100 Subject: [PATCH 2/3] refs #5802 feat:ticket_setState --- db/routines/vn/procedures/ticket_setState.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/routines/vn/procedures/ticket_setState.sql b/db/routines/vn/procedures/ticket_setState.sql index bd70275530..af471b154b 100644 --- a/db/routines/vn/procedures/ticket_setState.sql +++ b/db/routines/vn/procedures/ticket_setState.sql @@ -32,7 +32,7 @@ BEGIN END IF; SET vCanChangeState = (( - vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR + vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR vticketAlertLevel < vPackedAlertLevel )AND NOT ( vTicketStateCode IN ('CHECKED', 'CHECKING') From 4bf08ea1473b8348281c78d039cae85f65d5dba0 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Wed, 31 Jan 2024 07:23:46 +0100 Subject: [PATCH 3/3] refs #5890 feat:reserves --- db/routines/vn/procedures/ticket_setState.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/routines/vn/procedures/ticket_setState.sql b/db/routines/vn/procedures/ticket_setState.sql index af471b154b..bde8e06928 100644 --- a/db/routines/vn/procedures/ticket_setState.sql +++ b/db/routines/vn/procedures/ticket_setState.sql @@ -51,5 +51,6 @@ BEGIN ELSE CALL util.throw('INCORRECT_TICKET_STATE'); END IF; + END$$ DELIMITER ;