verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #6291 validation original
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Satorres 2023-12-26 15:03:10 +01:00
parent c4ff4c1984
commit c77715d865
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/dump/fixtures.sql
View File

@ -3014,7 +3014,7 @@ UPDATE `vn`.`client`
SET fi='65004204V' SET fi='65004204V'
WHERE id=1; WHERE id=1;
UPDATE `vn`.`client` UPDATE `vn`.`worker`
SET fi='59328808D' SET fi='59328808D'
WHERE id=1106; WHERE id=1106;

9
modules/worker/back/models/worker.js
View File

@ -34,17 +34,12 @@ module.exports = Self => {
fields: ['code'], fields: ['code'],
where: {id: this.countryFk} where: {id: this.countryFk}
}; };
const country = await Self.app.models.Country.findOne(filter); const country = await Self.app.models.Country.findOne(filter);
const code = country ? country.code.toLowerCase() : null; const code = country ? country.code.toLowerCase() : null;
const client = (await Self.findById(this.id, { const countryCode = this.fi?.toLowerCase().substring(0, 2);
include: {relation: 'client'}}))?.client();
if (client) {
const countryCode = client.fi?.toLowerCase().substring(0, 2);
if (!client.fi || !validateTin(client.fi, code) || countryCode == code) if (!this.fi || !validateTin(this.fi, code) || countryCode == code)
err(); err();
}
done(); done();
} }
}; };