Merge branch 'dev' into 7784-entryOrderPdf

db/routines/srt/triggers/buffer_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`buffer_afterDelete`
+	AFTER DELETE ON `buffer`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO buffer
+		SET `action` = 'delete',
+			`changedModel` = 'Buffer',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/srt/triggers/buffer_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`buffer_beforeInsert`
+	BEFORE INSERT ON `buffer`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/srt/triggers/buffer_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`buffer_beforeUpdate`
+	BEFORE UPDATE ON `buffer`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/srt/triggers/config_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`config_afterDelete`
+	AFTER DELETE ON `config`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO config
+		SET `action` = 'delete',
+			`changedModel` = 'Config',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/srt/triggers/config_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`config_beforeInsert`
+	BEFORE INSERT ON `config`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/srt/triggers/config_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`config_beforeUpdate`
+	BEFORE UPDATE ON `config`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_recalcByScope.sql

@@ -14,16 +14,28 @@ BEGIN
 	DECLARE vTicketFk INT;
 
 	DECLARE cTickets CURSOR FOR
-		SELECT id FROM ticket
+		SELECT DISTINCT t.id
-			WHERE refFk IS NULL
+			FROM ticket t
-				AND ((vScope = 'client' AND clientFk = vId)
+				LEFT JOIN tItems ti ON ti.id = t.id
-					OR (vScope = 'address' AND addressFk = vId));
+			WHERE t.refFk IS NULL
+				AND ((vScope = 'client' AND t.clientFk = vId)
+					OR (vScope = 'address' AND t.addressFk = vId)
+					OR (vScope = 'item' AND ti.id)
+				);
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-		SET vDone = TRUE;
+
+	CREATE OR REPLACE TEMPORARY TABLE tItems
+		(PRIMARY KEY (id))
+		ENGINE = MEMORY
+		SELECT DISTINCT t.id
+			FROM ticket t
+				JOIN sale s ON s.ticketFk = t.id
+				JOIN itemTaxCountry itc ON itc.itemFk = s.itemFk
+			WHERE t.refFk IS NULL
+				AND (vScope = 'item' AND itc.itemFk = vId);
 
 	OPEN cTickets;
-
 	myLoop: LOOP
 		SET vDone = FALSE;
 		FETCH cTickets INTO vTicketFk;
@@ -34,7 +46,8 @@ BEGIN
 
 		CALL ticket_recalc(vTicketFk, NULL);
 	END LOOP;
-
 	CLOSE cTickets;
+
+	DROP TEMPORARY TABLE tItems;
 END$$
 DELIMITER ;

db/versions/11193-bronzeAspidistra/00-firstScript.sql

@@ -0,0 +1,19 @@
+CREATE OR REPLACE TABLE `srt`.`bufferLog` (
+    `id` int(11) NOT NULL AUTO_INCREMENT,
+    `originFk` int(11) DEFAULT NULL,
+    `userFk` int(10) unsigned DEFAULT NULL,
+    `action` set('insert','update','delete','select') NOT NULL,
+    `creationDate` timestamp NULL DEFAULT current_timestamp(),
+    `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+    `changedModel` enum('Buffer', 'Config') NOT NULL DEFAULT 'Buffer',
+    `oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+    `newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+    `changedModelId` int(11) NOT NULL,
+    `changedModelValue` varchar(45) DEFAULT NULL,
+    `summaryId` varchar(30) DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    KEY `logBufferUserFk` (`userFk`),
+    KEY `bufferLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+    KEY `bufferLog_originFk` (`originFk`,`creationDate`),
+    CONSTRAINT `bufferUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

db/versions/11193-bronzeAspidistra/01-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE srt.buffer ADD editorFk int(10) unsigned DEFAULT NULL NULL;

db/versions/11193-bronzeAspidistra/02-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE srt.config ADD editorFk int(10) unsigned DEFAULT NULL NULL;

db/versions/11194-orangeOrchid/00-firstScript.sql

@@ -0,0 +1,9 @@
+CREATE TABLE vn.quadMindsApiConfig (
+	id int(10) unsigned NULL PRIMARY KEY,
+	`url` varchar(255) DEFAULT NULL NULL,
+	`key` varchar(255) DEFAULT NULL NULL,
+	CONSTRAINT quadMindsConfig_check CHECK (id = 1)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;