diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql index 8dc363590c..b4c37510f3 100644 --- a/db/dump/fixtures.before.sql +++ b/db/dump/fixtures.before.sql @@ -2829,11 +2829,17 @@ INSERT INTO `bs`.`defaulter` (`clientFk`, `amount`, `created`, `defaulterSinced` (1109, 500, util.VN_CURDATE(), util.VN_CURDATE()); UPDATE `vn`.`route` - SET `invoiceInFk`=1 + SET + `invoiceInFk`=1, + `kmStart`=0, + `kmEnd`=0 WHERE `id`=1; UPDATE `vn`.`route` - SET `invoiceInFk`=2 + SET + `invoiceInFk`=2, + `kmStart`=0, + `kmEnd`=0 WHERE `id`=2; INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`, `typeFk`, `clientFk`) diff --git a/modules/route/back/methods/agency-term/filter.js b/modules/route/back/methods/agency-term/filter.js index d52d93e952..1b2b5caab9 100644 --- a/modules/route/back/methods/agency-term/filter.js +++ b/modules/route/back/methods/agency-term/filter.js @@ -95,6 +95,7 @@ module.exports = Self => { + sat.packagePrice * SUM(t.packages) ) AS DECIMAL(10,2)) price, r.invoiceInFk, + i.supplierRef, sat.supplierFk, s.name supplierName FROM vn.route r @@ -103,6 +104,7 @@ module.exports = Self => { LEFT JOIN vn.ticket t ON t.routeFk = r.id LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id 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 GROUP BY r.id ) a`