From fc53e98bb58af1cdf758b5ae49c691ae4369ba4a Mon Sep 17 00:00:00 2001 From: sergiodt Date: Wed, 24 Jan 2024 10:48:01 +0100 Subject: [PATCH 1/3] refs #6028 hotFix : getByWorker days to show --- modules/route/back/methods/route/getByWorker.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/route/back/methods/route/getByWorker.js b/modules/route/back/methods/route/getByWorker.js index 7e70cb1f14..77be479579 100644 --- a/modules/route/back/methods/route/getByWorker.js +++ b/modules/route/back/methods/route/getByWorker.js @@ -1,3 +1,5 @@ +const {ConsoleMessage} = require('puppeteer'); + const mergeFilters = require('vn-loopback/util/filter').mergeFilters; module.exports = Self => { @@ -40,7 +42,7 @@ module.exports = Self => { currentDate.setHours(0, 0, 0, 0); const nextDay = Date.vnNew(); nextDay.setDate(currentDate.getDate() + 1); - + nextDay.setHours(0, 0, 0, 0); const filter = { where: { and: [ From 48e4e21aa899d35588d299263bbdf385ffb32c94 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Wed, 24 Jan 2024 12:55:51 +0100 Subject: [PATCH 2/3] refs #6028 hotFix : getByWorker days to show --- modules/route/back/methods/route/getByWorker.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/route/back/methods/route/getByWorker.js b/modules/route/back/methods/route/getByWorker.js index 77be479579..9243cfbfb2 100644 --- a/modules/route/back/methods/route/getByWorker.js +++ b/modules/route/back/methods/route/getByWorker.js @@ -1,5 +1,3 @@ -const {ConsoleMessage} = require('puppeteer'); - const mergeFilters = require('vn-loopback/util/filter').mergeFilters; module.exports = Self => { From ece0c926ddc2ad63d93179ee5b8093944d7d456b Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 24 Jan 2024 14:52:49 +0100 Subject: [PATCH 3/3] refs #6745 fix: duplicate fixtures --- db/dump/fixtures.sql | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 3e12659af6..0a45cc2162 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2512,19 +2512,6 @@ INSERT INTO `vn`.`rate`(`dated`, `warehouseFk`, `rate0`, `rate1`, `rate2`, `rate (DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), 1, 10, 15, 20, 25), (util.VN_CURDATE(), 1, 12, 17, 22, 27); -INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk) - VALUES - (1, '07546501420', 67, 671, util.VN_CURDATE(), 1761, 1, 1), - (2, '07546491421', 252, 2769, util.VN_CURDATE(), 5231, 1, 1), - (3, '07546500823', 102, 1495, util.VN_CURDATE(), 3221, 1, 1), - (4, '99610288821', 252, 2777, util.VN_CURDATE(), 3641, 1, 1), - (5, '07546500834', 229, 3292, util.VN_CURDATE(), 6601, 2, 1), - (6, '22101929561', 37, 458, util.VN_CURDATE(), 441, 2, 1), - (7, '07546491432', 258, 3034, util.VN_CURDATE(), 6441, 2, 1), - (8, '99610288644', 476, 4461, util.VN_CURDATE(), 5751, 442, 1), - (9, '99610289193', 302, 2972, util.VN_CURDATE(), 3871, 442, 1), - (10, '07546500856', 185, 2364, util.VN_CURDATE(), 5321, 442, 1); - INSERT INTO `vn`.`dua` (id, code, awbFk__, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk) VALUES (1, '19ES0028013A481523', 1, util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 11276.95, 442),