From 417222905189164ec5515eb56300d4a7a8e9248f Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 29 Sep 2022 09:35:57 +0200 Subject: [PATCH 1/3] Closure hotfix --- modules/monitor/front/index/tickets/index.html | 3 +++ print/methods/closure/closeAll.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html index a504301a5..138788ed6 100644 --- a/modules/monitor/front/index/tickets/index.html +++ b/modules/monitor/front/index/tickets/index.html @@ -210,6 +210,9 @@ + + diff --git a/print/methods/closure/closeAll.js b/print/methods/closure/closeAll.js index dad8b4569..513574418 100644 --- a/print/methods/closure/closeAll.js +++ b/print/methods/closure/closeAll.js @@ -11,10 +11,10 @@ module.exports = async function(request, response, next) { if (reqArgs.to) toDate = reqArgs.to; const todayMinDate = new Date(); - minDate.setHours(0, 0, 0, 0); + todayMinDate.setHours(0, 0, 0, 0); const todayMaxDate = new Date(); - maxDate.setHours(23, 59, 59, 59); + todayMinDate.setHours(23, 59, 59, 59); // Prevent closure for current day if (toDate >= todayMinDate && toDate <= todayMaxDate) From d7b563c5ec4e6d6c115fff9cf5d8534eedf71fbd Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 29 Sep 2022 10:09:01 +0200 Subject: [PATCH 2/3] Debug logs --- print/methods/closure/closeAll.js | 2 ++ print/methods/closure/closure.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/print/methods/closure/closeAll.js b/print/methods/closure/closeAll.js index 513574418..36b853052 100644 --- a/print/methods/closure/closeAll.js +++ b/print/methods/closure/closeAll.js @@ -20,6 +20,8 @@ module.exports = async function(request, response, next) { if (toDate >= todayMinDate && toDate <= todayMaxDate) throw new Error('You cannot close tickets for today'); + console.log(`Making closure up to ${toDate}...`); + const tickets = await db.rawSql(` SELECT t.id, diff --git a/print/methods/closure/closure.js b/print/methods/closure/closure.js index 67a2538e8..fe5aba5e7 100644 --- a/print/methods/closure/closure.js +++ b/print/methods/closure/closure.js @@ -7,11 +7,13 @@ const storage = require('vn-print/core/storage'); module.exports = { async start(tickets, reqArgs) { + console.log(tickets); if (tickets.length == 0) return; const failedtickets = []; for (const ticket of tickets) { try { + console.log(`Closing ticket id ${ticket.id}...`); await db.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id]); const invoiceOut = await db.findOne(` From 12f4ef0850e0c0f5c5771316e5ab1de649d3c726 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 30 Sep 2022 13:55:41 +0200 Subject: [PATCH 3/3] fix(print): log sent mails --- print/core/smtp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/print/core/smtp.js b/print/core/smtp.js index 50a413673..a55ba448d 100644 --- a/print/core/smtp.js +++ b/print/core/smtp.js @@ -29,7 +29,7 @@ module.exports = { for (let attachment of options.attachments) { const fileName = attachment.filename; const filePath = attachment.path; - if (fileName.includes('.png')) return; + if (fileName.includes('.png')) continue; if (fileName || filePath) attachments.push(filePath ? filePath : fileName);