diff --git a/db/routines/vn/procedures/ticketClon.sql b/db/routines/vn/procedures/ticketClon.sql index 00386c6aa1..9144ac7092 100644 --- a/db/routines/vn/procedures/ticketClon.sql +++ b/db/routines/vn/procedures/ticketClon.sql @@ -4,8 +4,7 @@ BEGIN DECLARE vNewTicketFk INT; - CALL ticket_CloneAll(vTicketFk, vNewShipped, TRUE, vNewTicketFk); - SELECT vNewTicketFk; + CALL ticket_cloneAll(vTicketFk, vNewShipped, TRUE, vNewTicketFk); END$$ DELIMITER ; diff --git a/db/routines/vn/procedures/ticket_CloneAll.sql b/db/routines/vn/procedures/ticket_cloneAll.sql similarity index 87% rename from db/routines/vn/procedures/ticket_CloneAll.sql rename to db/routines/vn/procedures/ticket_cloneAll.sql index a2d775a8fe..4b3401ed7a 100644 --- a/db/routines/vn/procedures/ticket_CloneAll.sql +++ b/db/routines/vn/procedures/ticket_cloneAll.sql @@ -1,8 +1,8 @@ DELIMITER $$ -CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_CloneAll`(vTicketFk INT, vNewShipped DATE, vWithWarehouse BOOLEAN, OUT vNewTicketFk INT) +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_cloneAll`(vTicketFk INT, vNewShipped DATE, vWithWarehouse BOOLEAN, OUT vNewTicketFk INT) BEGIN - DECLARE done INT DEFAULT FALSE; + DECLARE vDone BOOLEAN DEFAULT FALSE; DECLARE vOldSaleFk INT; DECLARE vNewSaleFk INT; @@ -11,7 +11,7 @@ BEGIN FROM sale WHERE ticketFk = vTicketFk; - DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE()); @@ -29,7 +29,7 @@ BEGIN FETCH cur1 INTO vOldSaleFk; - IF done THEN + IF vDone THEN LEAVE read_loop; END IF; diff --git a/modules/ticket/back/methods/ticket/clone.js b/modules/ticket/back/methods/ticket/clone.js index 535c6fc7c5..93bc2a94ea 100644 --- a/modules/ticket/back/methods/ticket/clone.js +++ b/modules/ticket/back/methods/ticket/clone.js @@ -40,7 +40,7 @@ module.exports = Self => { try { const [, [{clonedTicketId}]] = await Self.rawSql(` - CALL vn.ticket_CloneAll(?, ?, ?, @clonedTicketId); + CALL vn.ticket_cloneAll(?, ?, ?, @clonedTicketId); SELECT @clonedTicketId clonedTicketId;`, [id, shipped, withWarehouse], myOptions);