From 821e2cbe4d4a95614ef724b621c1b15f85684895 Mon Sep 17 00:00:00 2001 From: ivanm Date: Tue, 28 Jan 2025 19:11:56 +0100 Subject: [PATCH 1/4] feat: refs #8312 new column packaging.rejectCost --- db/versions/11427-azureChico/00-firstScript.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 db/versions/11427-azureChico/00-firstScript.sql diff --git a/db/versions/11427-azureChico/00-firstScript.sql b/db/versions/11427-azureChico/00-firstScript.sql new file mode 100644 index 000000000..8c232efcc --- /dev/null +++ b/db/versions/11427-azureChico/00-firstScript.sql @@ -0,0 +1,2 @@ +ALTER TABLE vn.packaging + ADD COLUMN rejectCost decimal(10, 2) NOT NULL DEFAULT 0.00 \ No newline at end of file From 70d286df805b725fccf67352df0d5a89c255384e Mon Sep 17 00:00:00 2001 From: ivanm Date: Wed, 29 Jan 2025 14:59:19 +0100 Subject: [PATCH 2/4] feat: refs #8487 deprecate travel.appointment --- db/versions/11428-blackArborvitae/00-firstScript.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 db/versions/11428-blackArborvitae/00-firstScript.sql diff --git a/db/versions/11428-blackArborvitae/00-firstScript.sql b/db/versions/11428-blackArborvitae/00-firstScript.sql new file mode 100644 index 000000000..4e9aecafa --- /dev/null +++ b/db/versions/11428-blackArborvitae/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE vn.travel CHANGE appointment appointment__ datetime DEFAULT NULL COMMENT '@deprecated 2025-01-28'; \ No newline at end of file From 0a89a6a6fdb366e944ad6c8527c5dde86f21ba94 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 30 Jan 2025 12:40:48 +0100 Subject: [PATCH 3/4] fix: refs #7488 deleted nif validation --- modules/worker/back/models/worker.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js index 97e6a283c..4895a6107 100644 --- a/modules/worker/back/models/worker.js +++ b/modules/worker/back/models/worker.js @@ -1,5 +1,4 @@ module.exports = Self => { - const validateTin = require('vn-loopback/util/validateTin'); require('../methods/worker/filter')(Self); require('../methods/worker/mySubordinates')(Self); require('../methods/worker/isSubordinate')(Self); @@ -23,26 +22,10 @@ module.exports = Self => { require('../methods/worker/getAvailablePda')(Self); require('../methods/worker/myTeam')(Self); - Self.validateAsync('fi', tinIsValid, { - message: 'Invalid TIN' - }); - Self.canModifyAbsenceInPast = async(ctx, time) => { const hasPrivs = await Self.app.models.ACL.checkAccessAcl(ctx, 'Worker', 'canModifyAbsenceInPast', 'WRITE'); const today = Date.vnNew(); today.setHours(0, 0, 0, 0); return hasPrivs || today.getTime() < time; }; - - async function tinIsValid(err, done) { - const country = await Self.app.models.Country.findOne({ - fields: ['code'], - where: {id: this.originCountryFk} - }); - const code = country ? country.code.toLowerCase() : null; - - if (!this.fi || !validateTin(this.fi, code)) - err(); - done(); - } }; From e0e72272a73b4c5c81a20ba37f20edc20eb9828b Mon Sep 17 00:00:00 2001 From: ivanm Date: Thu, 30 Jan 2025 17:35:30 +0100 Subject: [PATCH 4/4] feat: refs #8312 change column name --- db/versions/11427-azureChico/00-firstScript.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/versions/11427-azureChico/00-firstScript.sql b/db/versions/11427-azureChico/00-firstScript.sql index 8c232efcc..34a8c8d14 100644 --- a/db/versions/11427-azureChico/00-firstScript.sql +++ b/db/versions/11427-azureChico/00-firstScript.sql @@ -1,2 +1,2 @@ ALTER TABLE vn.packaging - ADD COLUMN rejectCost decimal(10, 2) NOT NULL DEFAULT 0.00 \ No newline at end of file + ADD COLUMN flippingCost decimal(10, 2) NOT NULL DEFAULT 0.00 \ No newline at end of file