From 50f1fd30aa019c0abbee49061515fb39cd442a01 Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 30 Mar 2021 13:15:42 +0200 Subject: [PATCH 1/2] Risk tolerance fixture --- db/dump/fixtures.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 6e92f3ab4..e99988410 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -294,6 +294,10 @@ INSERT INTO `vn`.`clientManaCache`(`clientFk`, `mana`, `dated`) (103, 0, DATE_ADD(CURDATE(), INTERVAL -1 MONTH)), (104, -30, DATE_ADD(CURDATE(), INTERVAL -1 MONTH)); +INSERT INTO `vn`.`clientConfig`(`riskTolerance`) + VALUES + (200); + INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `clientFk`, `agencyModeFk`, `longitude`, `latitude`, `isEqualizated`, `isDefaultAddress`) VALUES (1, 'Bruce Wayne', '1007 Mountain Drive, Gotham', 'Silla', 46460, 1, 1111111111, 222222222, 1, 101, 2, NULL, NULL, 0, 1), From d9834ae740b1b27614999f443b4a989f05d3b7d0 Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 30 Mar 2021 14:02:15 +0200 Subject: [PATCH 2/2] Removed old versions --- .../10280-valentineDay/00-department.sql | 4 - .../10280-valentineDay/00-itemImageQueue.sql | 2 - db/changes/10281-valentineDay/00-ACL.sql | 5 - .../10281-valentineDay/00-item_getBalance.sql | 137 ------------------ db/changes/10281-valentineDay/00-supplier.sql | 2 - db/changes/10290-invoiceIn/00-ACL.sql | 4 - db/changes/10290-invoiceIn/00-module.sql | 20 --- .../10290-invoiceIn/01-starredModule.sql | 10 -- db/changes/10291-invoiceIn/00-ACL.sql | 5 - 9 files changed, 189 deletions(-) delete mode 100644 db/changes/10280-valentineDay/00-department.sql delete mode 100644 db/changes/10280-valentineDay/00-itemImageQueue.sql delete mode 100644 db/changes/10281-valentineDay/00-ACL.sql delete mode 100644 db/changes/10281-valentineDay/00-item_getBalance.sql delete mode 100644 db/changes/10281-valentineDay/00-supplier.sql delete mode 100644 db/changes/10290-invoiceIn/00-ACL.sql delete mode 100644 db/changes/10290-invoiceIn/00-module.sql delete mode 100644 db/changes/10290-invoiceIn/01-starredModule.sql delete mode 100644 db/changes/10291-invoiceIn/00-ACL.sql diff --git a/db/changes/10280-valentineDay/00-department.sql b/db/changes/10280-valentineDay/00-department.sql deleted file mode 100644 index bb3062825..000000000 --- a/db/changes/10280-valentineDay/00-department.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE `vn`.`department` - ADD code VARCHAR(45) NULL AFTER id; - -UPDATE `vn`.`department` t SET t.code = 'IT', t.chatName = 'informatica-cau' WHERE t.id = 31; diff --git a/db/changes/10280-valentineDay/00-itemImageQueue.sql b/db/changes/10280-valentineDay/00-itemImageQueue.sql deleted file mode 100644 index 41c55552d..000000000 --- a/db/changes/10280-valentineDay/00-itemImageQueue.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `vn`.`itemImageQueue` - ADD attempts INT default 0 NULL AFTER error; diff --git a/db/changes/10281-valentineDay/00-ACL.sql b/db/changes/10281-valentineDay/00-ACL.sql deleted file mode 100644 index 861db5777..000000000 --- a/db/changes/10281-valentineDay/00-ACL.sql +++ /dev/null @@ -1,5 +0,0 @@ -INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) - VALUES - ('SupplierAccount', '*', '*', 'ALLOW', 'ROLE', 'administrative'), - ('Entry', '*', '*', 'ALLOW', 'ROLE', 'administrative'), - ('InvoiceIn', '*', '*', 'ALLOW', 'ROLE', 'administrative'); diff --git a/db/changes/10281-valentineDay/00-item_getBalance.sql b/db/changes/10281-valentineDay/00-item_getBalance.sql deleted file mode 100644 index 96c82cc01..000000000 --- a/db/changes/10281-valentineDay/00-item_getBalance.sql +++ /dev/null @@ -1,137 +0,0 @@ -DROP PROCEDURE `vn`.`item_getBalance`; - -DELIMITER $$ -$$ -CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`item_getBalance`(IN vItemId INT, IN vWarehouse INT) -BEGIN - DECLARE vDateInventory DATETIME; - DECLARE vCurdate DATE DEFAULT CURDATE(); - DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate); - - SELECT inventoried INTO vDateInventory FROM config; - SET @a = 0; - SET @currentLineFk = 0; - SET @shipped = ''; - - SELECT DATE(@shipped:= shipped) shipped, - alertLevel, - stateName, - origin, - reference, - clientFk, - name, - `in`, - `out`, - @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance, - @currentLineFk := IF (@shipped < CURDATE() - OR (@shipped = CURDATE() AND (isPicked OR alertLevel >= 2)), - lineFk,@currentLineFk) lastPreparedLineFk, - isTicket, - lineFk, - isPicked, - clientType - FROM - ( SELECT tr.landed AS shipped, - b.quantity AS `in`, - NULL AS `out`, - al.alertLevel AS alertLevel, - st.name AS stateName, - s.name AS name, - e.ref AS reference, - e.id AS origin, - s.id AS clientFk, - IF(al.alertLevel = 3, TRUE, FALSE) isPicked, - FALSE AS isTicket, - b.id lineFk, - NULL `order`, - NULL AS clientType - FROM buy b - JOIN entry e ON e.id = b.entryFk - JOIN travel tr ON tr.id = e.travelFk - JOIN supplier s ON s.id = e.supplierFk - JOIN alertLevel al ON al.alertLevel = - CASE - WHEN tr.shipped < CURDATE() THEN 3 - WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3 - ELSE 0 - END - JOIN state st ON st.code = al.code - WHERE tr.landed >= vDateInventory - AND vWarehouse = tr.warehouseInFk - AND b.itemFk = vItemId - AND e.isInventory = FALSE - AND e.isRaid = FALSE - UNION ALL - - SELECT tr.shipped, - NULL as `in`, - b.quantity AS `out`, - al.alertLevel AS alertLevel, - st.name AS stateName, - s.name AS name, - e.ref AS reference, - e.id AS origin, - s.id AS clientFk, - IF(al.alertLevel = 3, TRUE, FALSE) isPicked, - FALSE AS isTicket, - b.id, - NULL `order`, - NULL AS clientType - FROM buy b - JOIN entry e ON e.id = b.entryFk - JOIN travel tr ON tr.id = e.travelFk - JOIN warehouse w ON w.id = tr.warehouseOutFk - JOIN supplier s ON s.id = e.supplierFk - JOIN alertLevel al ON al.alertLevel = - CASE - WHEN tr.shipped < CURDATE() THEN 3 - WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3 - ELSE 0 - END - JOIN state st ON st.code = al.code - WHERE tr.shipped >= vDateInventory - AND vWarehouse =tr.warehouseOutFk - AND s.id <> 4 - AND b.itemFk = vItemId - AND e.isInventory = FALSE - AND w.isFeedStock = FALSE - AND e.isRaid = FALSE - UNION ALL - - SELECT DATE(t.shipped), - NULL as `in`, - s.quantity AS `out`, - al.alertLevel AS alertLevel, - st.name AS stateName, - t.nickname AS name, - t.refFk AS reference, - t.id AS origin, - t.clientFk, - stk.id AS isPicked, - TRUE AS isTicket, - s.id, - st.`order`, - ct.code AS clientType - FROM sale s - JOIN ticket t ON t.id = s.ticketFk - LEFT JOIN ticketState ts ON ts.ticket = t.id - LEFT JOIN state st ON st.code = ts.code - JOIN client c ON c.id = t.clientFk - JOIN clientType ct ON ct.id = c.clientTypeFk - JOIN alertLevel al ON al.alertLevel = - CASE - WHEN t.shipped < curdate() THEN 3 - WHEN t.shipped > util.dayEnd(curdate()) THEN 0 - ELSE IFNULL(ts.alertLevel, 0) - END - LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED' - LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id - WHERE t.shipped >= vDateInventory - AND s.itemFk = vItemId - AND vWarehouse =t.warehouseFk - ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC - ) AS itemDiary; - -END$$ -DELIMITER ; - diff --git a/db/changes/10281-valentineDay/00-supplier.sql b/db/changes/10281-valentineDay/00-supplier.sql deleted file mode 100644 index c35a86a23..000000000 --- a/db/changes/10281-valentineDay/00-supplier.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `vn`.`supplier` ADD COLUMN `workerFk` INT(11) NULL DEFAULT NULL COMMENT 'Responsible for approving invoices' AFTER `isTrucker`; -ALTER TABLE `vn`.`supplier` ADD CONSTRAINT `supplier_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE; \ No newline at end of file diff --git a/db/changes/10290-invoiceIn/00-ACL.sql b/db/changes/10290-invoiceIn/00-ACL.sql deleted file mode 100644 index e3551c667..000000000 --- a/db/changes/10290-invoiceIn/00-ACL.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) - VALUES - ('StarredModule', '*', '*', 'ALLOW', 'ROLE', 'employee'), - ('ItemBotanical', '*', 'WRITE', 'ALLOW', 'ROLE', 'logisticBoss'); \ No newline at end of file diff --git a/db/changes/10290-invoiceIn/00-module.sql b/db/changes/10290-invoiceIn/00-module.sql deleted file mode 100644 index 780a0e7fe..000000000 --- a/db/changes/10290-invoiceIn/00-module.sql +++ /dev/null @@ -1,20 +0,0 @@ -CREATE TABLE `salix`.`module` ( - `code` VARCHAR(45) COLLATE utf8_unicode_ci NOT NULL, - PRIMARY KEY (`code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO `salix`.`module`(`code`) - VALUES - ('Items'), - ('Orders'), - ('Clients'), - ('Entries'), - ('Travels'), - ('Invoices out'), - ('Suppliers'), - ('Claims'), - ('Routes'), - ('Tickets'), - ('Workers'), - ('Users'), - ('Zones'); \ No newline at end of file diff --git a/db/changes/10290-invoiceIn/01-starredModule.sql b/db/changes/10290-invoiceIn/01-starredModule.sql deleted file mode 100644 index e36777030..000000000 --- a/db/changes/10290-invoiceIn/01-starredModule.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE TABLE `vn`.`starredModule` ( - `id` INT(11) unsigned NOT NULL AUTO_INCREMENT, - `workerFk` INT(10) NOT NULL, - `moduleFk` VARCHAR(45) COLLATE utf8_unicode_ci NOT NULL, - PRIMARY KEY (`id`), - KEY `starred_workerFk` (`workerFk`), - KEY `starred_moduleFk` (`moduleFk`), - CONSTRAINT `starred_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE, - CONSTRAINT `starred_moduleFk` FOREIGN KEY (`moduleFk`) REFERENCES `salix`.`module` (`code`) ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; \ No newline at end of file diff --git a/db/changes/10291-invoiceIn/00-ACL.sql b/db/changes/10291-invoiceIn/00-ACL.sql deleted file mode 100644 index 5a1cf6843..000000000 --- a/db/changes/10291-invoiceIn/00-ACL.sql +++ /dev/null @@ -1,5 +0,0 @@ -INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) - VALUES - ('Genus', '*', 'WRITE', 'ALLOW', 'ROLE', 'logisticBoss'), - ('Specie', '*', 'WRITE', 'ALLOW', 'ROLE', 'logisticBoss'), - ('InvoiceOut', 'createPdf', 'WRITE', 'ALLOW', 'ROLE', 'invoicing');