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

8524-devToTest #3415

Merged
alexm merged 343 commits from 8524-devToTest into test 2025-02-04 13:42:16 +00:00
Conversation 0 Commits 343 Files Changed 127 +3 -16
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 857874c4c6 - Show all commits

6
db/versions/11202-limeRuscus/00-addAlertLevel.sql
View File

@ -1,6 +0,0 @@
UPDATE vn.alertLevel SET id = 5 WHERE id = 4;
UPDATE vn.alertLevel SET id = 4 WHERE id = 3;
UPDATE vn.alertLevel SET id = 3 WHERE id = 2;
UPDATE vn.alertLevel SET id = 2 WHERE id = 1;
INSERT INTO vn.alertLevel (code, id, hasToRecalcPrice)
VALUES ('APPROVED', 1, 1)

9
db/versions/11202-limeRuscus/01-updateStateAlertLevel.sql
View File

@ -1,12 +1,5 @@
UPDATE vn.state UPDATE vn.state
SET alertLevel = 1 -- APPROVED SET alertLevel = 1 -- ON_PREVIOUS
WHERE id IN (
3, -- Ok
4 -- Impreso
);
UPDATE vn.state
SET alertLevel = 2 -- ON_PREVIOUS
WHERE id IN ( WHERE id IN (
36, -- Previa Revisando 36, -- Previa Revisando
37, -- Previa Revisado 37, -- Previa Revisado

4
modules/ticket/back/methods/state/isEditable.js
View File

@ -34,8 +34,8 @@ module.exports = Self => {
state.code == 'PICKER_DESIGNED' || state.code == 'PRINTED' state.code == 'PICKER_DESIGNED' || state.code == 'PRINTED'
) )
); );
const alertLevel = await models.AlertLevel.findOne({where: {code: 'FREE'}}, myOptions);
const isAllowed = isAllEditable || isSomeEditable || state.alertLevel == 0; const isAllowed = isAllEditable || isSomeEditable || state.alertLevel == alertLevel.id;
return isAllowed; return isAllowed;
}; };
}; };