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

feat: check general status 'open' to close ticket
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Vicent Llopis 2022-09-15 08:34:42 +02:00
parent cd78afb539
commit 28bf7bd747
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
back/methods/osticket/closeTicket.js
View File

@ -30,6 +30,7 @@ module.exports = Self => {
const sql = `SELECT ot.ticket_id, ot.number const sql = `SELECT ot.ticket_id, ot.number
FROM osticket.ost_ticket ot FROM osticket.ost_ticket ot
JOIN osticket.ost_ticket_status ots ON ots.id = ot.status_id
JOIN osticket.ost_thread ot2 ON ot2.object_id = ot.ticket_id AND ot2.object_type = 'T' JOIN osticket.ost_thread ot2 ON ot2.object_id = ot.ticket_id AND ot2.object_type = 'T'
JOIN ( JOIN (
SELECT ote.thread_id, MAX(ote.created) created, MAX(ote.updated) updated SELECT ote.thread_id, MAX(ote.created) created, MAX(ote.updated) updated
@ -38,7 +39,7 @@ module.exports = Self => {
GROUP BY ote.thread_id GROUP BY ote.thread_id
) sub ON sub.thread_id = ot2.id ) sub ON sub.thread_id = ot2.id
WHERE ot.isanswered = 1 WHERE ot.isanswered = 1
AND status_id IN (${config.oldStatusId}) AND ots.state = '${config.oldStatus}'
AND IF(sub.updated > sub.created, sub.updated, sub.created) < DATE_SUB(CURDATE(), INTERVAL ${config.day} DAY)`; AND IF(sub.updated > sub.created, sub.updated, sub.created) < DATE_SUB(CURDATE(), INTERVAL ${config.day} DAY)`;
let ticketsId = []; let ticketsId = [];
@ -96,7 +97,7 @@ module.exports = Self => {
const ostUri = `${config.host}/ajax.php/tickets/${ticketId}/status`; const ostUri = `${config.host}/ajax.php/tickets/${ticketId}/status`;
const data = { const data = {
status_id: config.newStatusId, status_id: config.newStatusId,
comments: undefined, comments: config.comment,
undefined: config.action undefined: config.action
}; };
const params = { const params = {

7
back/models/osticket-config.json
View File

@ -21,8 +21,8 @@
"password": { "password": {
"type": "string" "type": "string"
}, },
"oldStatusId": { "oldStatus": {
"type": "number" "type": "string"
}, },
"newStatusId": { "newStatusId": {
"type": "number" "type": "number"
@ -32,6 +32,9 @@
}, },
"day": { "day": {
"type": "number" "type": "number"
},
"comment": {
"type": "string"
} }
} }
} }

7
db/changes/10481-june/00-osTicketConfig.sql
View File

@ -3,13 +3,14 @@ CREATE TABLE `vn`.`osTicketConfig` (
`host` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `host` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`user` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `user` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`password` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `password` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`oldStatusId` int(11) DEFAULT NULL, `oldStatus` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`newStatusId` int(11) DEFAULT NULL, `newStatusId` int(11) DEFAULT NULL,
`action` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `action` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`day` int(11) DEFAULT NULL, `day` int(11) DEFAULT NULL,
`comment` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
INSERT INTO `vn`.`osTicketConfig`(id, host, `user`, password, oldStatusId, newStatusId, `action`, `day`) INSERT INTO `vn`.`osTicketConfig`(`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `action`, `day`, `comment`)
VALUES VALUES
(0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', 1, 3, 'Cerrar', 60); (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', 'open', 3, 'Cerrar', 60, 'Este CAU se ha cerrado automáticamente');