feat: refs #8119 Requested changes

2024-10-23 08:30:21 +02:00 · 2024-10-23 08:30:21 +02:00 · 3cde6b6bc6
parent 31c89538bc
commit 3cde6b6bc6
1 changed files with 2 additions and 1 deletions
--- a/db/routines/vn/procedures/itemCampaign_add.sql
+++ b/db/routines/vn/procedures/itemCampaign_add.sql
@ -34,6 +34,7 @@ proc: BEGIN
 	END IF;

 	SET vDateSumFrom = vDateSumTo - INTERVAL vScopeDays DAY;
+	SET vDateSumTo = vDateSumTo - INTERVAL 1 DAY;

 	INSERT INTO itemCampaign(dated, itemFk, quantity, total, campaign)
 		SELECT vYesterday,
@ -44,7 +45,7 @@ proc: BEGIN
 			FROM sale s
 				JOIN ticket t ON t.id = s.ticketFk
 				JOIN client c ON c.id = t.clientFk
-			WHERE t.shipped BETWEEN vDateSumFrom AND vDateSumTo
+			WHERE t.shipped BETWEEN vDateSumFrom AND util.dayEnd(vDateSumTo)
 				AND c.typeFk = 'normal'
 				AND NOT t.isDeleted
 			GROUP BY s.itemFk