From c65211de462c48132fa6ec3126195926e9ca5797 Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 11 Jul 2018 13:52:10 +0200 Subject: [PATCH] update structure DB --- .../changes/1.0.8/{ACL.sql => 01-ACL.sql} | 0 .../{alertLevel.sql => 02-alertLevel.sql} | 0 .../1.0.8/{itemDiary.sql => 03-itemDiary.sql} | 0 ...te.sql => 04-ticketComponentCalculate.sql} | 0 ... => 05-ticketComponentPriceDifference.sql} | 0 ...e.sql => 06-ticketComponentUpdateSale.sql} | 0 ...e.sql => 07-ticketGetVisibleAvailable.sql} | 0 .../1.0.8/08-ticketGetVisibleAvailable.sql | 31 +++++++++++++++++++ 8 files changed, 31 insertions(+) rename services/db/install/changes/1.0.8/{ACL.sql => 01-ACL.sql} (100%) rename services/db/install/changes/1.0.8/{alertLevel.sql => 02-alertLevel.sql} (100%) rename services/db/install/changes/1.0.8/{itemDiary.sql => 03-itemDiary.sql} (100%) rename services/db/install/changes/1.0.8/{ticketComponentCalculate.sql => 04-ticketComponentCalculate.sql} (100%) rename services/db/install/changes/1.0.8/{ticketComponentPriceDifference.sql => 05-ticketComponentPriceDifference.sql} (100%) rename services/db/install/changes/1.0.8/{ticketComponentUpdateSale.sql => 06-ticketComponentUpdateSale.sql} (100%) rename services/db/install/changes/1.0.8/{ticketGetVisibleAvailable.sql => 07-ticketGetVisibleAvailable.sql} (100%) create mode 100644 services/db/install/changes/1.0.8/08-ticketGetVisibleAvailable.sql diff --git a/services/db/install/changes/1.0.8/ACL.sql b/services/db/install/changes/1.0.8/01-ACL.sql similarity index 100% rename from services/db/install/changes/1.0.8/ACL.sql rename to services/db/install/changes/1.0.8/01-ACL.sql diff --git a/services/db/install/changes/1.0.8/alertLevel.sql b/services/db/install/changes/1.0.8/02-alertLevel.sql similarity index 100% rename from services/db/install/changes/1.0.8/alertLevel.sql rename to services/db/install/changes/1.0.8/02-alertLevel.sql diff --git a/services/db/install/changes/1.0.8/itemDiary.sql b/services/db/install/changes/1.0.8/03-itemDiary.sql similarity index 100% rename from services/db/install/changes/1.0.8/itemDiary.sql rename to services/db/install/changes/1.0.8/03-itemDiary.sql diff --git a/services/db/install/changes/1.0.8/ticketComponentCalculate.sql b/services/db/install/changes/1.0.8/04-ticketComponentCalculate.sql similarity index 100% rename from services/db/install/changes/1.0.8/ticketComponentCalculate.sql rename to services/db/install/changes/1.0.8/04-ticketComponentCalculate.sql diff --git a/services/db/install/changes/1.0.8/ticketComponentPriceDifference.sql b/services/db/install/changes/1.0.8/05-ticketComponentPriceDifference.sql similarity index 100% rename from services/db/install/changes/1.0.8/ticketComponentPriceDifference.sql rename to services/db/install/changes/1.0.8/05-ticketComponentPriceDifference.sql diff --git a/services/db/install/changes/1.0.8/ticketComponentUpdateSale.sql b/services/db/install/changes/1.0.8/06-ticketComponentUpdateSale.sql similarity index 100% rename from services/db/install/changes/1.0.8/ticketComponentUpdateSale.sql rename to services/db/install/changes/1.0.8/06-ticketComponentUpdateSale.sql diff --git a/services/db/install/changes/1.0.8/ticketGetVisibleAvailable.sql b/services/db/install/changes/1.0.8/07-ticketGetVisibleAvailable.sql similarity index 100% rename from services/db/install/changes/1.0.8/ticketGetVisibleAvailable.sql rename to services/db/install/changes/1.0.8/07-ticketGetVisibleAvailable.sql diff --git a/services/db/install/changes/1.0.8/08-ticketGetVisibleAvailable.sql b/services/db/install/changes/1.0.8/08-ticketGetVisibleAvailable.sql new file mode 100644 index 0000000000..4d7a4b3bd2 --- /dev/null +++ b/services/db/install/changes/1.0.8/08-ticketGetVisibleAvailable.sql @@ -0,0 +1,31 @@ +CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetVisibleAvailable`( + vTicket INT) +BEGIN + DECLARE vVisibleCalc INT; + DECLARE vAvailableCalc INT; + DECLARE vShipped DATE; + DECLARE vWarehouse TINYINT; + DECLARE vAlertLevel INT; + + SELECT t.warehouseFk, t.shipped, ts.alertLevel INTO vWarehouse, vShipped, vAlertLevel + FROM ticket t + LEFT JOIN ticketState ts ON ts.ticketFk = vTicket + WHERE t.id = vTicket; + + IF vAlertLevel IS NULL OR vAlertLevel = 0 THEN + IF vShipped >= CURDATE() THEN + CALL cache.available_refresh(vAvailableCalc, FALSE, vWarehouse, vShipped); + END IF; + IF vShipped = CURDATE() THEN + CALL cache.visible_refresh(vVisibleCalc, FALSE, vWarehouse); + END IF; + END IF; + + SELECT s.id, s.itemFk, s.quantity, s.concept, s.price, s.reserved, s.discount, v.visible, av.available, it.image + FROM sale s + LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCalc + LEFT JOIN cache.available av ON av.item_id = s.itemFk AND av.calc_id = vAvailableCalc + LEFT JOIN item it ON it.id = s.itemFk + WHERE s.ticketFk = vTicket; + +END \ No newline at end of file