From 9cf6f8f0311fcada2b0f406ae3858f3b03efbb1b Mon Sep 17 00:00:00 2001 From: ivanm Date: Fri, 14 Feb 2025 14:50:39 +0100 Subject: [PATCH 1/3] feat: refs #8558 modify claim_beforeInsert --- db/routines/vn/triggers/claim_beforeInsert.sql | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/db/routines/vn/triggers/claim_beforeInsert.sql b/db/routines/vn/triggers/claim_beforeInsert.sql index dc3ef8c7a2..25440eb0b3 100644 --- a/db/routines/vn/triggers/claim_beforeInsert.sql +++ b/db/routines/vn/triggers/claim_beforeInsert.sql @@ -3,6 +3,13 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`claim_beforeInsert` BEFORE INSERT ON `claim` FOR EACH ROW BEGIN + DECLARE vCreated DATE; + + SELECT created INTO vCreated FROM ticket WHERE id = NEW.ticketFk; + IF vCreated > util.VN_CURDATE() THEN + CALL util.throw('Future ticket date not allowed.'); + END IF; + SET NEW.editorFk = account.myUser_getId(); END$$ DELIMITER ; From 472e52bc8c513ca6eda8aa90ed3b6076287a9831 Mon Sep 17 00:00:00 2001 From: ivanm Date: Fri, 14 Feb 2025 15:03:58 +0100 Subject: [PATCH 2/3] feat: refs #8558 use shipped --- db/routines/vn/triggers/claim_beforeInsert.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/routines/vn/triggers/claim_beforeInsert.sql b/db/routines/vn/triggers/claim_beforeInsert.sql index 25440eb0b3..8cebac391f 100644 --- a/db/routines/vn/triggers/claim_beforeInsert.sql +++ b/db/routines/vn/triggers/claim_beforeInsert.sql @@ -3,13 +3,13 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`claim_beforeInsert` BEFORE INSERT ON `claim` FOR EACH ROW BEGIN - DECLARE vCreated DATE; + DECLARE vShipped DATE; - SELECT created INTO vCreated FROM ticket WHERE id = NEW.ticketFk; - IF vCreated > util.VN_CURDATE() THEN + SELECT shipped INTO vShipped FROM ticket WHERE id = NEW.ticketFk; + IF vShipped > util.VN_CURDATE() THEN CALL util.throw('Future ticket date not allowed.'); END IF; - + SET NEW.editorFk = account.myUser_getId(); END$$ DELIMITER ; From 0088460e63cb589b6d7f6eec4c1c0465cb3d3e96 Mon Sep 17 00:00:00 2001 From: ivanm Date: Mon, 17 Feb 2025 15:15:11 +0100 Subject: [PATCH 3/3] feat: refs #8558 requested modifications --- db/routines/vn/triggers/claim_beforeInsert.sql | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/db/routines/vn/triggers/claim_beforeInsert.sql b/db/routines/vn/triggers/claim_beforeInsert.sql index 8cebac391f..25d103c4cf 100644 --- a/db/routines/vn/triggers/claim_beforeInsert.sql +++ b/db/routines/vn/triggers/claim_beforeInsert.sql @@ -3,13 +3,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`claim_beforeInsert` BEFORE INSERT ON `claim` FOR EACH ROW BEGIN - DECLARE vShipped DATE; - - SELECT shipped INTO vShipped FROM ticket WHERE id = NEW.ticketFk; - IF vShipped > util.VN_CURDATE() THEN - CALL util.throw('Future ticket date not allowed.'); - END IF; - SET NEW.editorFk = account.myUser_getId(); + + IF (SELECT shipped FROM ticket WHERE id = NEW.ticketFk) > util.VN_NOW() THEN + CALL util.throw('Future ticket date not allowed'); + END IF; END$$ DELIMITER ;