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

7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
Conversation 0 Commits 636 Files Changed 209 +7 -4
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 365e05d560 - Show all commits

4
db/changes/235001/00-newWareHouse.sql
View File

@ -9,4 +9,6 @@ INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalTyp
('SaleTracking','updateTracking','WRITE','ALLOW','ROLE','employee'), ('SaleTracking','updateTracking','WRITE','ALLOW','ROLE','employee'),
('SaleTracking','mark','WRITE','ALLOW','ROLE','employee'), ('SaleTracking','mark','WRITE','ALLOW','ROLE','employee'),
('ItemBarcode','deleteByItemAndCode','WRITE','ALLOW','ROLE','employee'), ('ItemBarcode','deleteByItemAndCode','WRITE','ALLOW','ROLE','employee'),
('Collection','addItem','WRITE','ALLOW','ROLE','employee'); ('Collection','addItem','WRITE','ALLOW','ROLE','employee');
('ExpeditionPallet', '*', 'READ', 'ALLOW', 'ROLE', 'production');

7
modules/worker/back/methods/operator/getPrinter.js
View File

@ -7,7 +7,7 @@ module.exports = Self => {
verb: 'GET' verb: 'GET'
}, },
returns: { returns: {
type: 'object', type: ['object'],
}, },
}); });
@ -30,10 +30,11 @@ module.exports = Self => {
if (operator) { if (operator) {
const printer = operator.printer(); const printer = operator.printer();
return { console.log({
id: printer.id, id: printer.id,
name: printer.name name: printer.name
}; });
return Array.isArray(printer) ? printer : [printer];
} }
}; };
}; };