Merge pull request '#5878 - Remove . for This ticket is locked' (!1894) from 6172_transfer_ticket_message_error into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1894 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
08228c065c
|
@ -18,7 +18,7 @@ Show summary: Mostrar vista previa
|
|||
What is new: Novedades de la versión
|
||||
Settings: Ajustes
|
||||
There is a new version, click here to reload: Hay una nueva versión, pulse aquí para recargar
|
||||
This ticket is locked.: Este ticket está bloqueado
|
||||
This ticket is locked: Este ticket está bloqueado
|
||||
|
||||
# Actions
|
||||
|
||||
|
|
|
@ -183,7 +183,7 @@
|
|||
"Social name should be uppercase": "Social name should be uppercase",
|
||||
"Street should be uppercase": "Street should be uppercase",
|
||||
"You don't have enough privileges.": "You don't have enough privileges.",
|
||||
"This ticket is locked.": "This ticket is locked.",
|
||||
"This ticket is locked": "This ticket is locked",
|
||||
"This ticket is not editable.": "This ticket is not editable.",
|
||||
"The ticket doesn't exist.": "The ticket doesn't exist.",
|
||||
"The sales do not exists": "The sales do not exists",
|
||||
|
@ -201,4 +201,4 @@
|
|||
"keepPrice": "keepPrice",
|
||||
"Cannot past travels with entries": "Cannot past travels with entries",
|
||||
"It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -312,7 +312,7 @@
|
|||
"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
|
||||
"This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
|
||||
"You don't have enough privileges.": "No tienes suficientes permisos.",
|
||||
"This ticket is locked.": "Este ticket está bloqueado.",
|
||||
"This ticket is locked": "Este ticket está bloqueado.",
|
||||
"This ticket is not editable.": "Este ticket no es editable.",
|
||||
"The ticket doesn't exist.": "No existe el ticket.",
|
||||
"Social name should be uppercase": "La razón social debe ir en mayúscula",
|
||||
|
@ -330,4 +330,4 @@
|
|||
"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
|
||||
"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
|
||||
"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -41,7 +41,7 @@ module.exports = Self => {
|
|||
throw new ForbiddenError(`This ticket is not editable.`);
|
||||
|
||||
if (isLocked && !isWeekly)
|
||||
throw new ForbiddenError(`This ticket is locked.`);
|
||||
throw new ForbiddenError(`This ticket is locked`);
|
||||
|
||||
if (isWeekly && !canEditWeeklyTicket)
|
||||
throw new ForbiddenError(`You don't have enough privileges.`);
|
||||
|
|
|
@ -89,6 +89,6 @@ describe('ticket addSale()', () => {
|
|||
error = e;
|
||||
}
|
||||
|
||||
expect(error.message).toEqual(`This ticket is locked.`);
|
||||
expect(error.message).toEqual(`This ticket is locked`);
|
||||
});
|
||||
});
|
||||
|
|
|
@ -40,7 +40,7 @@ describe('ticket isEditableOrThrow()', () => {
|
|||
expect(error.message).toEqual(`This ticket is not editable.`);
|
||||
});
|
||||
|
||||
it('should throw an error as this ticket is locked.', async() => {
|
||||
it('should throw an error as This ticket is locked', async() => {
|
||||
const tx = await models.Ticket.beginTransaction({});
|
||||
let error;
|
||||
try {
|
||||
|
@ -57,7 +57,7 @@ describe('ticket isEditableOrThrow()', () => {
|
|||
await tx.rollback();
|
||||
}
|
||||
|
||||
expect(error.message).toEqual(`This ticket is locked.`);
|
||||
expect(error.message).toEqual(`This ticket is locked`);
|
||||
});
|
||||
|
||||
it('should throw an error as you do not have enough privileges.', async() => {
|
||||
|
|
|
@ -39,6 +39,6 @@ describe('ticket recalculateComponents()', () => {
|
|||
error = e;
|
||||
}
|
||||
|
||||
expect(error).toEqual(new ForbiddenError(`This ticket is locked.`));
|
||||
expect(error).toEqual(new ForbiddenError(`This ticket is locked`));
|
||||
});
|
||||
});
|
||||
|
|
|
@ -23,7 +23,7 @@ describe('Ticket transferClient()', () => {
|
|||
error = e;
|
||||
}
|
||||
|
||||
expect(error.message).toEqual(`This ticket is locked.`);
|
||||
expect(error.message).toEqual(`This ticket is locked`);
|
||||
});
|
||||
|
||||
it('should be assigned a different clientFk', async() => {
|
||||
|
|
Loading…
Reference in New Issue