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

Merge branch '1719-claim-detail' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-09-26 10:16:43 +00:00 committed by Gitea
parent e57210fdfc a8c6c57b7e
commit 51a9ad951f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ticket/back/methods/ticket/isEditable.js
View File

@ -26,7 +26,10 @@ module.exports = Self => {
where: {ticketFk: id}
});
let isProductionBoss = await Self.app.models.Account.hasRole(userId, 'salesAssistant');
const isSalesAssistant = await Self.app.models.Account.hasRole(userId, 'salesAssistant');
const isProductionBoss = await Self.app.models.Account.hasRole(userId, 'productionBoss');
const isValidRole = isSalesAssistant || isProductionBoss;
let alertLevel = state ? state.alertLevel : null;
let ticket = await Self.app.models.Ticket.findById(id, {
fields: ['isDeleted', 'clientFk', 'refFk'],
@ -45,7 +48,7 @@ module.exports = Self => {
const isNormalClient = ticket && ticket.client().type().code == 'normal';
const isInvoiced = ticket && ticket.refFk;
if (!ticket || isInvoiced || isDeleted || (isOnDelivery && isNormalClient && !isProductionBoss))
if (!ticket || isInvoiced || isDeleted || (isOnDelivery && isNormalClient && !isValidRole))
return false;
return true;

7
modules/ticket/back/methods/ticket/specs/isEditable.spec.js
View File

@ -29,6 +29,13 @@ describe('ticket isEditable()', () => {
expect(result).toEqual(true);
});
it('should be able to edit a deleted or invoiced ticket if the role is salesAssistant', async() => {
let ctx = {req: {accessToken: {userId: 21}}};
let result = await app.models.Ticket.isEditable(ctx, 8);
expect(result).toEqual(true);
});
it('should be able to edit a deleted or invoiced ticket if the role is productionBoss', async() => {
let ctx = {req: {accessToken: {userId: 50}}};
let result = await app.models.Ticket.isEditable(ctx, 8);