6745-2404_testToMaster #1950

Merged
alexm merged 191 commits from 6745-2404_testToMaster into master 2024-01-25 07:39:13 +00:00
1 changed files with 22 additions and 6 deletions
Showing only changes of commit ea31d3bebb - Show all commits

View File

@ -7,12 +7,28 @@ module.exports = {
name: 'letter-debtor-nd',
async serverPrefetch() {
this.debtor = await db.findOne(`
SELECT sa.iban, be.name bankName
SELECT sa.iban,
be.name bankName,
sa.countryFk,
c.countryFk
FROM supplierAccount sa
LEFT JOIN bankEntity be ON sa.bankEntityFk = be.id
JOIN bankEntity be ON sa.bankEntityFk = be.id
LEFT JOIN company co ON co.supplierAccountFk = sa.id
LEFT JOIN client c ON c.countryFk = sa.countryFk
WHERE c.id = ? OR (c.id IS NULL AND c.countryFk = sa.countryFk)`,
[this.id]);
WHERE c.id = ?
ORDER BY co.id DESC
LIMIT 1;
`, [this.id]);
if (!this.debtor.length) {
this.debtor = await db.findOne(`
SELECT sa.iban,
be.name bankName
FROM supplierAccount sa
JOIN bankEntity be ON sa.bankEntityFk = be.id
JOIN company co ON co.supplierAccountFk = sa.id
WHERE co.code = ?;
`, [this.companyCode]);
}
},
data() {
return {