Merge branch 'master' into Hotfix-crear-report-Factura-Electronica

back/methods/osticket/closeTicket.js

@@ -25,10 +25,10 @@ module.exports = Self => {
             return false;
 
         const con = mysql.createConnection({
-            host: `${config.hostDb}`,
+            host: config.hostDb,
-            user: `${config.userDb}`,
+            user: config.userDb,
-            password: `${config.passwordDb}`,
+            password: config.passwordDb,
-            port: `${config.portDb}`
+            port: config.portDb
         });
 
         const sql = `SELECT ot.ticket_id, ot.number
@@ -38,23 +38,23 @@ module.exports = Self => {
                             JOIN (
                                 SELECT ote.thread_id, MAX(ote.created) created, MAX(ote.updated) updated
                                     FROM osticket.ost_thread_entry ote
-                                    WHERE ote.staff_id != 0 AND ote.type = 'R'
+                                    WHERE ote.staff_id AND ote.type = 'R'
                                     GROUP BY ote.thread_id
                             ) sub ON sub.thread_id = ot2.id
-                        WHERE ot.isanswered = 1
+                        WHERE ot.isanswered
-                            AND ots.state = '${config.oldStatus}'
+                            AND ots.state = ?
-                            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 ? DAY)`;
 
-        let ticketsId = [];
+        const ticketsId = [];
         con.connect(err => {
             if (err) throw err;
-            con.query(sql, (err, results) => {
+            con.query(sql, [config.oldStatus, config.day],
-                if (err) throw err;
+                (err, results) => {
-                for (const result of results)
+                    if (err) throw err;
-                    ticketsId.push(result.ticket_id);
+                    for (const result of results)
-            });
+                        ticketsId.push(result.ticket_id);
+                });
         });
-
         await getRequestToken();
 
         async function getRequestToken() {
@@ -94,6 +94,39 @@ module.exports = Self => {
             await close(token, secondCookie);
         }
 
+        async function close(token, secondCookie) {
+            for (const ticketId of ticketsId) {
+                try {
+                    const lockCode = await getLockCode(token, secondCookie, ticketId);
+                    let form = new FormData();
+                    form.append('__CSRFToken__', token);
+                    form.append('id', ticketId);
+                    form.append('a', config.responseType);
+                    form.append('lockCode', lockCode);
+                    form.append('from_email_id', config.fromEmailId);
+                    form.append('reply-to', config.replyTo);
+                    form.append('cannedResp', 0);
+                    form.append('response', config.comment);
+                    form.append('signature', 'none');
+                    form.append('reply_status_id', config.newStatusId);
+
+                    const ostUri = `${config.host}/tickets.php?id=${ticketId}`;
+                    const params = {
+                        method: 'POST',
+                        body: form,
+                        headers: {
+                            'Cookie': secondCookie
+                        }
+                    };
+                    await fetch(ostUri, params);
+                } catch (e) {
+                    const err = new Error(`${ticketId} Ticket close failed: ${e.message}`);
+                    err.stack += e.stack;
+                    throw err;
+                }
+            }
+        }
+
         async function getLockCode(token, secondCookie, ticketId) {
             const ostUri = `${config.host}/ajax.php/lock/ticket/${ticketId}`;
             const params = {
@@ -109,32 +142,5 @@ module.exports = Self => {
 
             return json.code;
         }
-
-        async function close(token, secondCookie) {
-            for (const ticketId of ticketsId) {
-                const lockCode = await getLockCode(token, secondCookie, ticketId);
-                let form = new FormData();
-                form.append('__CSRFToken__', token);
-                form.append('id', ticketId);
-                form.append('a', config.responseType);
-                form.append('lockCode', lockCode);
-                form.append('from_email_id', config.fromEmailId);
-                form.append('reply-to', config.replyTo);
-                form.append('cannedResp', 0);
-                form.append('response', config.comment);
-                form.append('signature', 'none');
-                form.append('reply_status_id', config.newStatusId);
-
-                const ostUri = `${config.host}/tickets.php?id=${ticketId}`;
-                const params = {
-                    method: 'POST',
-                    body: form,
-                    headers: {
-                        'Cookie': secondCookie
-                    }
-                };
-                return fetch(ostUri, params);
-            }
-        }
     };
 };

modules/ticket/back/methods/sale/usesMana.js

@@ -24,6 +24,8 @@ module.exports = Self => {
         const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
         const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
         const workerDepartment = await models.WorkerDepartment.findById(userId, null, myOptions);
+        if (!workerDepartment) return false;
+
         const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
 
         return usesMana ? true : false;