verdnatura/salix
verdnatura
/
salix
3
5
Fork 1
Code Issues Pull Requests 66 Releases Wiki Activity

3607-supplier_agencyTerm #905

Merged
carlosjr merged 22 commits from 3607-supplier_agencyTerm into dev 2022-03-29 08:03:03 +00:00
Conversation 0 Commits 22 Files Changed 24 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 920bff30c8 - Show all commits

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

@ -56,7 +56,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
WHERE r.created > DATE_ADD(CURDATE(), INTERVAL -2 MONTH) AND a.supplierFk IS NOT NULL WHERE r.created > DATE_ADD(CURDATE(), INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
GROUP BY r.id GROUP BY r.id
) a` ) a`
); );

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

@ -15,7 +15,7 @@ describe('AgencyTerm filter()', () => {
const firstAgencyTerm = agencyTerms[0]; const firstAgencyTerm = agencyTerms[0];
expect(firstAgencyTerm.routeFk).toEqual(1); expect(firstAgencyTerm.routeFk).toEqual(1);
expect(agencyTerms.length).toEqual(3); expect(agencyTerms.length).toEqual(5);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {