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

7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
Conversation 0 Commits 636 Files Changed 209 +6 -3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 70096e7a76 - Show all commits

9
modules/ticket/back/methods/ticket/restore.js
View File

@ -33,12 +33,15 @@ module.exports = Self => {
fields: ['originFk', 'creationDate', 'newInstance'] fields: ['originFk', 'creationDate', 'newInstance']
}, myOptions); }, myOptions);
console.log('ticket', ticket);
const now = Date.vnNew(); const now = Date.vnNew();
const maxDate = new Date(ticket.updated); const maxDate = new Date(ticket.creationDate);
maxDate.setHours(maxDate.getHours() + 1); maxDate.setHours(maxDate.getHours() + 1);
if (now > maxDate) if (ticket.newInstance.includes('isDeleted: true')) {
throw new UserError(`You can only restore a ticket within the first hour after deletion`); if (now > maxDate)
throw new UserError(`You can only restore a ticket within the first hour after deletion`);
}
// Send notification to salesPerson // Send notification to salesPerson
const salesPersonId = ticket.client().salesPersonFk; const salesPersonId = ticket.client().salesPersonFk;