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

#6276 createNewWarehouse methods migrated from silex to salix #1850

Merged
jorgep merged 158 commits from 6276-createNewWarehouse into dev 2024-03-06 11:32:11 +00:00
Conversation 4 Commits 158 Files Changed 59 +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'),
('Collection', 'assignCollection', '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/return')(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 => {
Self.remoteMethod('getSale', {
description: 'Update the visible items',
accessType: 'WRITE',
Self.remoteMethod('getFromSectorCollection', {
jgallego marked this conversation as resolved
jgallego commented 2024-01-29 08:23:06 +00:00
Review
Copy Link

confirma con @sergiodt que esto pasa así a salix, o se separa..o hay alguna tarea para separarlo

confirma con @sergiodt que esto pasa así a salix, o se separa..o hay alguna tarea para separarlo
sergiodt commented 2024-01-30 15:19:33 +00:00
Review
Copy Link

@jgallego Separarlo en quin sentit ? És el back que trau les linies de previa amb les seues ubicacions.....

@jgallego Separarlo en quin sentit ? És el back que trau les linies de previa amb les seues ubicacions.....
jgallego commented 2024-01-31 05:44:57 +00:00
Review
Copy Link

Crec que m'he confós tenia en ment allò de ticket or collection, tot clar.

Crec que m'he confós tenia en ment allò de ticket or collection, tot clar.
description: 'Get sales from sector collection',
accessType: 'READ',
accepts: [
{
arg: 'sectorCollectionFk',
@ -19,12 +19,12 @@ module.exports = Self => {
root: true
},
http: {
path: `/getSale`,
path: `/getFromSectorCollection`,
verb: 'GET'
},
});
Self.getSale = async(sectorCollectionFk, sectorFk, options) => {
Self.getFromSectorCollection = async(sectorCollectionFk, sectorFk, options) => {
const myOptions = {};
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/usesMana')(Self);
require('../methods/sale/clone')(Self);
require('../methods/sale/getFromSectorCollection')(Self);
Self.validatesPresenceOf('concept', {
message: `Concept cannot be blank`