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

hotfix fix createWorker business #2725

Closed
carlossa wants to merge 1 commits from hotfix-workerCountryValidate into master
pull from: hotfix-workerCountryValidate
merge into: verdnatura:master
Conversation 1 Commits 1 Files Changed 3 +8 -4
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/client/front/postcode/index.html
View File

@ -53,7 +53,7 @@
<vn-autocomplete vn-one <vn-autocomplete vn-one
ng-model="$ctrl.location.countryFk" ng-model="$ctrl.location.countryFk"
url="Countries" url="Countries"
show-field="country" show-field="name"
value-field="id" value-field="id"
label="Country"> label="Country">
</vn-autocomplete> </vn-autocomplete>

2
modules/worker/back/methods/worker/new.js
View File

@ -202,7 +202,7 @@ module.exports = Self => {
bossFk, bossFk,
fi, fi,
birth, birth,
provinceFk,
alexm commented 2024-07-12 10:14:55 +00:00
Review
Copy Link

Worker no tiene el campo provinceFk ni countryFk, el unico que tiene es originCountryFk

Worker no tiene el campo provinceFk ni countryFk, el unico que tiene es originCountryFk
}, myOptions); }, myOptions);
if (tx) await tx.commit(); if (tx) await tx.commit();

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

@ -27,13 +27,17 @@ module.exports = Self => {
}); });
async function tinIsValid(err, done) { async function tinIsValid(err, done) {
const countryFk = {
alexm commented 2024-07-12 10:15:23 +00:00
Review
Copy Link

Este enfoque no lo acabo de ver, se deberia sacar del originCountryFk

Este enfoque no lo acabo de ver, se deberia sacar del originCountryFk
fields: ['countryFk'],
where: {id: this.provinceFk}
};
const countryCode = await Self.app.models.Province.findOne(countryFk);
const filter = { const filter = {
fields: ['code'], fields: ['code'],
where: {id: this.countryFk} where: {id: countryCode.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;
if (!this.fi || !validateTin(this.fi, code)) if (!this.fi || !validateTin(this.fi, code))
err(); err();
done(); done();