verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
Conversation 0 Commits 636 Files Changed 209 +37 -22
3 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8f54a7f12d - Show all commits

9
db/dump/fixtures.local.sql
View File

@ -404,3 +404,12 @@ INSERT INTO floranet.builder(
FROM vn.item
WHERE name = 'Ramo Terranova';
INSERT IGNORE INTO floranet.addressPostCode (id, addressFk, postCode, hoursInAdvance, dayOfWeek, deliveryCost)
VALUES (1, 4, '46680', 48, 2, 6.00),
(5, 4, '46680', 24, 3, 6.00),
(6, 4, '46680', 24, 4, 6.00),
(7, 4, '46680', 24, 5, 6.00),
(8, 4, '46680', 24, 6, 0.00),
(9, 4, '46680', 24, 7, 20.00),
(2, 3, '46680', 24, 2, 9.25),
(3, 3, '46440', 24, 3, 0.00);

36
db/routines/floranet/procedures/deliveryDate_get.sql
View File

@ -2,34 +2,28 @@ DROP PROCEDURE IF EXISTS floranet.deliveryDate_get;
DELIMITER $$
$$
CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.deliveryDate_get(vPostalCode VARCHAR(15))
CREATE DEFINER=`root`@`localhost` PROCEDURE `floranet`.`deliveryDate_get`(vPostalCode VARCHAR(15))
READS SQL DATA
BEGIN
/**
* Returns available dates for this postalCode
* Returns available dates for this postalCode, in the next seven days
*
* @param vPostalCode Delivery address postal code
*/
CREATE OR REPLACE TEMPORARY TABLE tmp.deliveryDate
(dated DATE PRIMARY KEY)
ENGINE = MEMORY;
DECLARE vCurrentDayOfWeek INT;
IF vPostalCode != "00000" THEN
INSERT INTO tmp.deliveryDate
SET dated = CURDATE() + INTERVAL 1 DAY;
SET vCurrentDayOfWeek = DAYOFWEEK(NOW());
INSERT INTO tmp.deliveryDate
SET dated = CURDATE() + INTERVAL 2 DAY;
INSERT INTO tmp.deliveryDate
SET dated = CURDATE() + INTERVAL 4 DAY;
INSERT INTO tmp.deliveryDate
SET dated = CURDATE() + INTERVAL 7 DAY;
END IF;
SELECT * FROM tmp.deliveryDate;
DROP TEMPORARY TABLE tmp.deliveryDate;
SELECT DISTINCT nextDay
FROM (
SELECT CURDATE() + INTERVAL IF(
apc.dayOfWeek >= vCurrentDayOfWeek,
apc.dayOfWeek - vCurrentDayOfWeek,
7 - apc.dayOfWeek
) DAY nextDay,
NOW() + INTERVAL apc.hoursInAdvance - 12 HOUR minDeliveryTime
FROM addressPostCode apc
WHERE apc.postCode = vPostalCode
HAVING nextDay > minDeliveryTime) sub;
END$$
DELIMITER ;

12
db/versions/10956-brownBirch/00-firstScript.sql Normal file
View File

@ -0,0 +1,12 @@
CREATE TABLE floranet.`addressPostCode` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`addressFk` int(11) NOT NULL,
`postCode` varchar(30) NOT NULL,
`hoursInAdvance` int(10) unsigned NOT NULL DEFAULT 24,
`dayOfWeek` int(10) unsigned NOT NULL,
`deliveryCost` decimal(10,2) NOT NULL DEFAULT 0.00,
PRIMARY KEY (`id`),
UNIQUE KEY `addressPostCode_unique` (`postCode`,`addressFk`,`dayOfWeek`),
KEY `addressPostCode_address_FK` (`addressFk`),
CONSTRAINT `addressPostCode_address_FK` FOREIGN KEY (`addressFk`) REFERENCES `vn`.`address` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Client''s address registered for floranet network';