verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 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 +12 -11
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8a16c24245 - Show all commits

23
modules/ticket/front/descriptor-menu/index.js
View File

@ -8,6 +8,7 @@ class Controller extends Section {
this.vnReport = vnReport; this.vnReport = vnReport;
this.vnEmail = vnEmail; this.vnEmail = vnEmail;
this.vnFile = vnFile; this.vnFile = vnFile;
this.restoreTicket = vnRestoreTicket;
} }
get ticketId() { get ticketId() {
@ -172,18 +173,18 @@ class Controller extends Section {
} }
get canRestoreTicket() { get canRestoreTicket() {
// const isDeleted = this.ticket.isDeleted; const isDeleted = this.ticket.isDeleted;
// const now = Date.vnNew(); const now = Date.vnNew();
// const maxDate = new Date(this.ticket.updated); const maxDate = new Date(this.ticket.updated);
// maxDate.setHours(maxDate.getHours() + 1); maxDate.setHours(maxDate.getHours() + 1);
// return isDeleted && (now <= maxDate); return isDeleted && (now <= maxDate);
return this.$http.get(`TicketLogs`).then(res => { // return this.$http.get(`TicketLogs`).then(res => {
if (res && res.data.length) // if (res && res.data.length)
console.log(res.data); // console.log(res.data);
console.log(res); // console.log(res);
return true; // return true;
}); // });
} }
restoreTicket() { restoreTicket() {