Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance

db/changes/10503-november/00-ticket_canMerge.sql

@@ -7,3 +7,8 @@ BEGIN
  CALL vn.ticket_canbePostponed(vDated,TIMESTAMPADD(DAY, vScopeDays, vDated),vLitersMax,vLinesMax,vWarehouseFk);
 END  $$
 DELIMITER ;
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+VALUES
+    ('Ticket', 'getTicketsFuture', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Ticket', 'merge', 'WRITE', 'ALLOW', 'ROLE', 'employee');

db/changes/10503-november/00-ticket_canbePostponed.sql

@@ -76,3 +76,4 @@ BEGIN
 		HAVING liters <= IFNULL(vLitersMax, 9999) AND `lines` <= IFNULL(vLinesMax, 9999) AND ticketFuture;
 END$$
 DELIMITER ;
+

loopback/locale/en.json

@@ -137,6 +137,6 @@
 	"Claim pickup order sent": "Claim pickup order sent [({{claimId}})]({{{claimUrl}}}) to client *{{clientName}}*",
 	"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}}]({{{fullPath}}}) ({{{originDated}}}) merged with [{{tfId}}]({{{fullPathFuture}}}) ({{{futureDated}}})",
+	"Ticket merged": "Ticket [{{id}}]({{{fullPath}}}) ({{{originDated}}}) merged with [{{tfId}}]({{{fullPathFuture}}}) ({{{futureDated}}})",
     "The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified"
 }

loopback/locale/es.json

@@ -240,5 +240,5 @@
     "Claim pickup order sent": "Reclamación Orden de recogida enviada [({{claimId}})]({{{claimUrl}}}) al cliente *{{clientName}}*",
     "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}}]({{{fullPath}}}) ({{{originDated}}}) fusionado con [{{tfId}}]({{{fullPathFuture}}}) ({{{futureDated}}})"
+	"Ticket merged": "Ticket [{{id}}]({{{fullPath}}}) ({{{originDated}}}) fusionado con [{{tfId}}]({{{fullPathFuture}}}) ({{{futureDated}}})"
 }

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

@@ -42,7 +42,7 @@ module.exports = Self => {
             for (let ticket of tickets) {
                 const fullPath = `${origin}/#!/ticket/${ticket.id}/summary`;
                 const fullPathFuture = `${origin}/#!/ticket/${ticket.ticketFuture}/summary`;
-                const message = $t('MOVE_TICKET_CONFIRMATION', {
+                const message = $t('Ticket merged', {
                     originDated: dateUtil.toString(new Date(ticket.originETD)),
                     futureDated: dateUtil.toString(new Date(ticket.destETD)),
                     id: ticket.id,
@@ -54,10 +54,9 @@ module.exports = Self => {
                 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);
-            };
-            if (tx) {
-                await tx.commit();
             }
+            if (tx)
+                await tx.commit();
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

modules/ticket/back/models/ticket-future.json

@@ -5,7 +5,7 @@
       {
           "accessType": "READ",
           "principalType": "ROLE",
-          "principalId": "$authenticated",
+          "principalId": "employee",
           "permission": "ALLOW"
       }
     ]