fix rocket message and order table

loopback/locale/en.json

@@ -136,5 +136,5 @@
 	"Not enough privileges to edit a client": "Not enough privileges to edit a client",
 	"You don't have grant privilege": "You don't have grant privilege",
 	"You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
-	"MOVE_TICKET_CONFIRMATION": "Ticket {{id}} ({{originDated}}) merged with {{tfId}} ({{futureDated}}) [{{fullPath}}]"
+	"MOVE_TICKET_CONFIRMATION": "Ticket [{{id}}]({{{fullPath}}}) ({{{originDated}}}) merged with [{{tfId}}]({{{fullPathFuture}}}) ({{{futureDated}}})"
 }

loopback/locale/es.json

@@ -238,5 +238,5 @@
 	"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
     "You don't have grant privilege": "No tienes privilegios para dar privilegios",
     "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
-	"MOVE_TICKET_CONFIRMATION": "Ticket {{id}} ({{originDated}}) fusionado con {{tfId}} ({{futureDated}}) [{{fullPath}}]"
+	"MOVE_TICKET_CONFIRMATION": "Ticket [{{id}}]({{{fullPath}}}) ({{{originDated}}}) fusionado con [{{tfId}}]({{{fullPathFuture}}}) ({{{futureDated}}})"
 }

modules/ticket/back/methods/ticket-future/getTicketsFuture.js

@@ -203,8 +203,10 @@ module.exports = Self => {
         if (hasWhere) {
             filter = mergeFilters(filter, { where: problems });
         }
-        stmt.merge(conn.makeWhere(filter.where));
 
+        stmt.merge(conn.makeWhere(filter.where));
+        stmt.merge(conn.makeOrderBy(filter.order));
+        stmt.merge(conn.makeLimit(filter));
 
         const ticketsIndex = stmts.push(stmt) - 1;
 

modules/ticket/back/methods/ticket/merge.js

@@ -38,18 +38,20 @@ module.exports = Self => {
 
         try {
             for (let ticket of tickets) {
-                const fullPath = `${origin}/#!/ticket/${ticket.ticketFuture}/summary`;
+                const fullPath = `${origin}/#!/ticket/${ticket.id}/summary`;
+                const fullPathFuture = `${origin}/#!/ticket/${ticket.ticketFuture}/summary`;
                 const message = $t('MOVE_TICKET_CONFIRMATION', {
                     originDated: new Date(ticket.originETD).toLocaleDateString('es-ES'),
                     futureDated: new Date(ticket.destETD).toLocaleDateString('es-ES'),
                     id: ticket.id,
                     tfId: ticket.ticketFuture,
-                    fullPath
+                    fullPath,
+                    fullPathFuture
                 });
                 if (!ticket.id || !ticket.ticketFuture) continue;
                 await models.Sale.updateAll({ ticketFk: ticket.id }, { ticketFk: ticket.ticketFuture }, myOptions);
                 await models.Ticket.setDeleted(ctx, ticket.id, myOptions);
-                await models.Chat.sendCheckingPresence(ctx, ticket.workerFk, message);
+                await models.Chat.sendCheckingPresence(ctx, 1, message);
             };
             if (tx) {
                 await tx.commit();