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

7167-testToMaster_2414 #2244

Merged
alexm merged 643 commits from 7167-testToMaster_2414 into master 2024-04-04 05:32:41 +00:00
Conversation 0 Commits 643 Files Changed 208 +8 -7
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8a5da43503 - Show all commits

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

@ -14,5 +14,6 @@ INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalTyp
('MobileAppVersionControl', '*', 'READ', 'ALLOW', 'ROLE', 'production'), ('MobileAppVersionControl', '*', 'READ', 'ALLOW', 'ROLE', 'production'),
('Collection', 'assignCollection', 'WRITE', 'ALLOW', 'ROLE', 'production'), ('Collection', 'assignCollection', 'WRITE', 'ALLOW', 'ROLE', 'production'),
('Collection', 'addItem', 'WRITE', 'ALLOW', 'ROLE', 'production'), ('Collection', 'addItem', 'WRITE', 'ALLOW', 'ROLE', 'production'),
('MachineWorker', 'updateInTime', 'WRITE', 'ALLOW', 'ROLE', 'production');; ('Sale', 'getFromSectorCollection', 'READ', 'ALLOW', 'ROLE', 'employee'),
('Collection', 'addItem', 'WRITE', 'ALLOW', 'ROLE', 'production');

1
modules/item/back/models/item-shelving.js
View File

@ -4,5 +4,4 @@ module.exports = Self => {
require('../methods/item-shelving/makeMulti')(Self); require('../methods/item-shelving/makeMulti')(Self);
require('../methods/item-shelving/return')(Self); require('../methods/item-shelving/return')(Self);
require('../methods/item-shelving/updateFromSale')(Self); require('../methods/item-shelving/updateFromSale')(Self);
require('../methods/item-shelving/getSale')(Self);
}; };

10
modules/item/back/methods/item-shelving/getSale.js → modules/ticket/back/methods/sale/getFromSectorCollection.js
View File

@ -1,7 +1,7 @@
module.exports = Self => { module.exports = Self => {
Self.remoteMethod('getSale', { Self.remoteMethod('getFromSectorCollection', {
description: 'Update the visible items', description: 'Get sales from sector collection',
accessType: 'WRITE', accessType: 'READ',
accepts: [ accepts: [
{ {
arg: 'sectorCollectionFk', arg: 'sectorCollectionFk',
@ -19,12 +19,12 @@ module.exports = Self => {
root: true root: true
}, },
http: { http: {
path: `/getSale`, path: `/getFromSectorCollection`,
verb: 'GET' verb: 'GET'
}, },
}); });
Self.getSale = async(sectorCollectionFk, sectorFk, options) => { Self.getFromSectorCollection = async(sectorCollectionFk, sectorFk, options) => {
const myOptions = {}; const myOptions = {};
if (typeof options == 'object') Object.assign(myOptions, options); if (typeof options == 'object') Object.assign(myOptions, options);

1
modules/ticket/back/models/sale.js
View File

@ -13,6 +13,7 @@ module.exports = Self => {
require('../methods/sale/canEdit')(Self); require('../methods/sale/canEdit')(Self);
require('../methods/sale/usesMana')(Self); require('../methods/sale/usesMana')(Self);
require('../methods/sale/clone')(Self); require('../methods/sale/clone')(Self);
require('../methods/sale/getFromSectorCollection')(Self);
Self.validatesPresenceOf('concept', { Self.validatesPresenceOf('concept', {
message: `Concept cannot be blank` message: `Concept cannot be blank`