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

7199-devToTest_2316 #2287

Merged
alexm merged 169 commits from 7199-devToTest_2316 into test 2024-04-11 06:25:23 +00:00
Conversation 0 Commits 169 Files Changed 105 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a40234ba9b - Show all commits

2
modules/item/back/methods/item-shelving/hasItemOlder.js
View File

@ -53,7 +53,7 @@ module.exports = Self => {
AND (p.code <> ? OR ? IS NULL) AND (p.code <> ? OR ? IS NULL)
AND (ish.shelvingFk <> ? OR ? IS NULL) AND (ish.shelvingFk <> ? OR ? IS NULL)
AND (ish.itemFk <> ? OR ? IS NULL)`, AND (ish.itemFk <> ? OR ? IS NULL)`,
[shelvingFkIn, parking, parking, shelvingFkOut, shelvingFkOut, itemFk, itemFk]); [shelvingFkIn, parking, parking, shelvingFkOut, shelvingFkOut, itemFk, itemFk], options);
return result[0]['countItemOlder'] > 0; return result[0]['countItemOlder'] > 0;
}; };
}; };

4
modules/item/back/methods/item-shelving/specs/hasItemOlder.spec.js
View File

@ -5,7 +5,7 @@ describe('itemShelving hasOlder()', () => {
it('should return false because there are not older items', async() => { it('should return false because there are not older items', async() => {
const shelvingFkIn = 'GVC'; const shelvingFkIn = 'GVC';
const shelvingFkOut = 'HEJ'; const shelvingFkOut = 'HEJ';
const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, shelvingFkOut); const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, null, shelvingFkOut);
expect(result).toBe(false); expect(result).toBe(false);
}); });
@ -33,7 +33,7 @@ describe('itemShelving hasOlder()', () => {
await itemShelvingBefore.updateAttributes({ await itemShelvingBefore.updateAttributes({
itemFk: itemFk itemFk: itemFk
}); });
const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, parking); const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, parking, null, null, myOptions);
expect(result).toBe(true); expect(result).toBe(true);
await tx.rollback(); await tx.rollback();