verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

refactor: refs #8645 update route kmStart and kmEnd, and include supplierRef in agency-term filter #3480

Merged
jtubau merged 5 commits from 8645-addSupplierRefToAgencyTermFilter into dev 2025-02-27 12:07:01 +00:00
Conversation 0 Commits 5 Files Changed 2 +12 -4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
db/dump/fixtures.before.sql
View File

@ -2833,12 +2833,18 @@ INSERT INTO `bs`.`defaulter` (`clientFk`, `amount`, `created`, `defaulterSinced`
(1109, 500, util.VN_CURDATE(), util.VN_CURDATE()); (1109, 500, util.VN_CURDATE(), util.VN_CURDATE());
UPDATE `vn`.`route` UPDATE `vn`.`route`
SET `invoiceInFk`=1 SET
WHERE `id`=1; `invoiceInFk` = 1,
`kmStart` = 0,
`kmEnd` = 0
WHERE `id` = 1;
UPDATE `vn`.`route` UPDATE `vn`.`route`
SET `invoiceInFk`=2 SET
WHERE `id`=2; `invoiceInFk` = 2,
`kmStart` = 0,
`kmEnd` = 0
WHERE `id` = 2;
INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`, `typeFk`, `clientFk`) INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`, `typeFk`, `clientFk`)
VALUES VALUES

2
modules/route/back/methods/agency-term/filter.js
View File

@ -95,6 +95,7 @@ module.exports = Self => {
+ sat.packagePrice * SUM(t.packages) ) + sat.packagePrice * SUM(t.packages) )
AS DECIMAL(10,2)) price, AS DECIMAL(10,2)) price,
r.invoiceInFk, r.invoiceInFk,
i.supplierRef,
sat.supplierFk, sat.supplierFk,
s.name supplierName s.name supplierName
FROM vn.route r FROM vn.route r
@ -103,6 +104,7 @@ module.exports = Self => {
LEFT JOIN vn.ticket t ON t.routeFk = r.id LEFT JOIN vn.ticket t ON t.routeFk = r.id
LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
LEFT JOIN vn.supplier s ON s.id = sat.supplierFk LEFT JOIN vn.supplier s ON s.id = sat.supplierFk
LEFT JOIN vn.invoiceIn i ON i.id = r.invoiceInFk
WHERE r.dated > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL WHERE r.dated > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
GROUP BY r.id GROUP BY r.id
) a` ) a`