From b8b055b86c8ed7c2b950cfbefbbabb8b6750d224 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 2 May 2024 08:00:44 +0200 Subject: [PATCH 1/3] hotFix(getBalance): date setHours to 0 --- modules/item/back/methods/item/getBalance.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/item/back/methods/item/getBalance.js b/modules/item/back/methods/item/getBalance.js index d4e2d0f74a..20df8eeec9 100644 --- a/modules/item/back/methods/item/getBalance.js +++ b/modules/item/back/methods/item/getBalance.js @@ -27,8 +27,12 @@ module.exports = Self => { const where = filter.where; const query = 'CALL vn.item_getBalance(?, ?, ?)'; - const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, where.date], myOptions); - + let date; + if (where.date) { + date = new Date(where.date); + date.setHours(0, 0, 0, 0); + } + const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, date], myOptions); for (const entry of diary) if (entry.clientType === 'loses') entry.highlighted = true; From 77a1b4bb57cf0a7583a8daf558d285309e10d53c Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 2 May 2024 08:02:17 +0200 Subject: [PATCH 2/3] hotFix(getBalance): simplify --- modules/item/back/methods/item/getBalance.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/item/back/methods/item/getBalance.js b/modules/item/back/methods/item/getBalance.js index 20df8eeec9..770d8afbdb 100644 --- a/modules/item/back/methods/item/getBalance.js +++ b/modules/item/back/methods/item/getBalance.js @@ -27,12 +27,11 @@ module.exports = Self => { const where = filter.where; const query = 'CALL vn.item_getBalance(?, ?, ?)'; - let date; if (where.date) { - date = new Date(where.date); - date.setHours(0, 0, 0, 0); + where.date = new Date(where.date); + where.date.setHours(0, 0, 0, 0); } - const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, date], myOptions); + const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, where.date], myOptions); for (const entry of diary) if (entry.clientType === 'loses') entry.highlighted = true; From a00dd82f142412aca4a43fef15859a02feb67a26 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 2 May 2024 08:21:39 +0200 Subject: [PATCH 3/3] hotFix(getBalance): if null --- modules/item/back/methods/item/getBalance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/item/back/methods/item/getBalance.js b/modules/item/back/methods/item/getBalance.js index 770d8afbdb..207f8020f4 100644 --- a/modules/item/back/methods/item/getBalance.js +++ b/modules/item/back/methods/item/getBalance.js @@ -27,7 +27,7 @@ module.exports = Self => { const where = filter.where; const query = 'CALL vn.item_getBalance(?, ?, ?)'; - if (where.date) { + if (where?.date) { where.date = new Date(where.date); where.date.setHours(0, 0, 0, 0); }