db/routines/bs/procedures/waste_addSales.sql

@@ -1,8 +1,16 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`waste_addSales`()
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`waste_addSales`(
+	vDateFrom DATE, 
+	vDateTo DATE
+)
 BEGIN
-	DECLARE vDateFrom DATE DEFAULT util.VN_CURDATE() - INTERVAL WEEKDAY(util.VN_CURDATE()) DAY;
-	DECLARE vDateTo DATE DEFAULT vDateFrom + INTERVAL 6 DAY;
+	IF vDateFrom IS NULL THEN
+		SET vDateFrom = util.VN_CURDATE() - INTERVAL WEEKDAY(util.VN_CURDATE()) DAY;
+	END IF;
+
+	IF vDateTo IS NULL THEN
+		SET vDateTo = vDateFrom + INTERVAL 6 DAY;
+	END IF;
 
 	CALL cache.last_buy_refresh(FALSE);
 
@@ -56,6 +64,6 @@ BEGIN
 				JOIN vn.buy b ON b.id = lb.buy_id
 			WHERE t.shipped BETWEEN vDateFrom AND vDateTo
 				AND w.isManaged
-			GROUP BY i.id;
+			GROUP BY YEAR(t.shipped), WEEK(t.shipped, 4), i.id;
 END$$
 DELIMITER ;

db/routines/bs/procedures/waste_addSalesLauncher.sql

@@ -0,0 +1,6 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`waste_addSalesLauncher`()
+BEGIN
+	CALL waste_addSales(NULL, NULL);
+END$$
+DELIMITER ;

db/versions/11237-goldenBamboo/00-firstScript.sql

@@ -0,0 +1,3 @@
+UPDATE bs.nightTask
+	SET `procedure` = 'waste_addSalesLauncher'
+	WHERE `procedure` = 'waste_addSales';