diff --git a/db/routines/bs/procedures/indicatorsUpdate.sql b/db/routines/bs/procedures/indicatorsUpdate.sql index d66e52a61..7b5cd090d 100644 --- a/db/routines/bs/procedures/indicatorsUpdate.sql +++ b/db/routines/bs/procedures/indicatorsUpdate.sql @@ -125,12 +125,11 @@ BEGIN TRUNCATE salesByWeek; - INSERT INTO salesByWeek (week, year, sales) - SELECT t.week, t.year, SUM(v.importe + v.recargo) sales - FROM ventas v - LEFT JOIN vn.time t ON t.dated = fecha - GROUP BY t.week, t.year - ORDER BY t.week, t.year; + INSERT INTO salesByWeek (`year`, `week`, countryFk, sales) + SELECT YEAR(s.dated), WEEK(s.dated, 4), c.countryFk, SUM(s.amount) + FROM sale s + JOIN client c ON c.id = s.clientFk + GROUP BY YEAR(s.dated), WEEK(s.dated, 4), c.countryFk -- Indicador Ventas semana actual UPDATE indicators i diff --git a/db/versions/11340-maroonHydrangea/00-firstScript.sql b/db/versions/11340-maroonHydrangea/00-firstScript.sql new file mode 100644 index 000000000..b3eaea992 --- /dev/null +++ b/db/versions/11340-maroonHydrangea/00-firstScript.sql @@ -0,0 +1,8 @@ +ALTER TABLE bs.salesByWeek + ADD countryFk mediumint(8) unsigned NOT NULL, + CHANGE `year` `year` int(11) NOT NULL FIRST, + CHANGE countryFk countryFk mediumint(8) unsigned NOT NULL AFTER week, + CHANGE sales total double DEFAULT NULL NULL, + ADD CONSTRAINT salesByWeek_country_FK FOREIGN KEY (countryFk) REFERENCES vn.country(id) + ON DELETE RESTRICT + ON UPDATE CASCADE;