verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 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 +17 -19
9 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2a6abffef9 - Show all commits

3
back/methods/collection/assignCollection.js
View File

@ -16,7 +16,6 @@ module.exports = Self => {
Self.assignCollection = async(ctx, options) => { Self.assignCollection = async(ctx, options) => {
const userId = ctx.req.accessToken.userId; const userId = ctx.req.accessToken.userId;
const myOptions = {userId}; const myOptions = {userId};
const $t = ctx.req.__;
if (typeof options == 'object') if (typeof options == 'object')
Object.assign(myOptions, options); Object.assign(myOptions, options);
@ -26,7 +25,7 @@ module.exports = Self => {
const [assignedCollection] = await Self.rawSql('SELECT @vCollectionFk'); const [assignedCollection] = await Self.rawSql('SELECT @vCollectionFk');
const {'@vCollectionFk': collectionFk} = assignedCollection; const {'@vCollectionFk': collectionFk} = assignedCollection;
if (!collectionFk) throw new UserError($t('There are not picking tickets')); if (!collectionFk) throw new UserError('There are not picking tickets');
await Self.rawSql('CALL vn.collection_printSticker(?, NULL)', [collectionFk], myOptions); await Self.rawSql('CALL vn.collection_printSticker(?, NULL)', [collectionFk], myOptions);
return collectionFk; return collectionFk;

6
back/methods/mobile-app-version-control/getVersion.js
View File

@ -29,9 +29,9 @@ module.exports = Self => {
let fields = ['id', 'appName']; let fields = ['id', 'appName'];
if (workerFk) if (workerFk)
fields = [...fields, ...['isVersionBetaCritical', 'versionBeta', 'urlBeta']]; fields = fields.concat(['isVersionBetaCritical', 'versionBeta', 'urlBeta']);
else else
fields = [...fields, ...['isVersionCritical', 'version', 'urlProduction']]; fields = fields.concat(['isVersionCritical', 'version', 'urlProduction']);
const filter = { const filter = {
where: { where: {
@ -40,6 +40,6 @@ module.exports = Self => {
fields, fields,
}; };
return await Self.findOne(filter); return Self.findOne(filter);
}; };
}; };

1
modules/item/back/methods/item/card.js
View File

@ -36,7 +36,6 @@ module.exports = Self => {
fields: ['code'], fields: ['code'],
where: { where: {
itemFk: realIdItem itemFk: realIdItem
} }
}); });

13
modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
View File

@ -50,14 +50,17 @@ describe('ticket setDeleted()', () => {
return value; return value;
}; };
const ticketId = 23; const ticketId = 23;
const [sectorCollectionBefore] = await models.Ticket.rawSql(
await models.Ticket.setDeleted(ctx, ticketId, options);
const [sectorCollection] = await models.Ticket.rawSql(
`SELECT COUNT(*) numberRows `SELECT COUNT(*) numberRows
FROM vn.sectorCollection`, [], options); FROM vn.sectorCollection`, [], options);
expect(sectorCollection.numberRows).toEqual(1); await models.Ticket.setDeleted(ctx, ticketId, options);
const [sectorCollectionAfter] = await models.Ticket.rawSql(
`SELECT COUNT(*) numberRows
FROM vn.sectorCollection`, [], options);
expect(sectorCollectionAfter.numberRows).toEqual(sectorCollectionBefore.numberRows - 1);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {

3
modules/ticket/back/models/expeditionPallet.json
View File

@ -12,9 +12,6 @@
"id": true, "id": true,
"description": "Identifier" "description": "Identifier"
}, },
"truckFk": {
"type": "number"
},
"built": { "built": {
"type": "date" "type": "date"
}, },