verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 54 Releases Wiki Activity

5638-ticket.summary_states #1538

Merged
vicent merged 9 commits from 5638-ticket.summary_states into dev 2023-05-19 11:35:32 +00:00
Conversation 0 Commits 9 Files Changed 3 +6 -9
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 404acdab6f - Show all commits

15
modules/ticket/back/methods/state/editableStates.js
View File

@ -24,20 +24,17 @@ module.exports = Self => {
if (typeof options == 'object') if (typeof options == 'object')
Object.assign(myOptions, options); Object.assign(myOptions, options);
let statesList = await models.State.find(filter, myOptions);
const isProduction = await models.VnUser.hasRole(userId, 'production', myOptions); const isProduction = await models.VnUser.hasRole(userId, 'production', myOptions);
const isSalesPerson = await models.VnUser.hasRole(userId, 'salesPerson', myOptions); const isSalesPerson = await models.VnUser.hasRole(userId, 'salesPerson', myOptions);
vicent marked this conversation as resolved Outdated
alexm commented 2023-05-18 12:02:43 +00:00
Outdated
Review
Copy Link

Refactor, ho tens en rocket

Refactor, ho tens en rocket
const isAdministrative = await models.VnUser.hasRole(userId, 'administrative', myOptions); const isAdministrative = await models.VnUser.hasRole(userId, 'administrative', myOptions);
if (isProduction || isAdministrative) filter.where = {alertLevel: 0};
return statesList;
if (isSalesPerson) { if (isSalesPerson)
return statesList = statesList.filter(stateList => filter.where = {or: [{alertLevel: 0}, {code: 'PICKER_DESIGNED'}]};
stateList.alertLevel === 0 || stateList.code === 'PICKER_DESIGNED'
);
}
return statesList.filter(stateList => stateList.alertLevel === 0); if (isProduction || isAdministrative) delete filter.where;
return models.State.find(filter, myOptions);
}; };
}; };