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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jorge Penadés 2024-04-09 15:20:30 +02:00
parent 9a28a59d00 0e2e68488d
commit dca75437f1
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
back/methods/collection/getSales.js
View File

@ -29,6 +29,7 @@ module.exports = Self => {
});
Self.getSales = async(ctx, collectionOrTicketFk, print, source, options) => {
const models = Self.app.models;
const userId = ctx.req.accessToken.userId;
const myOptions = {userId};
const $t = ctx.req.__;

1
db/routines/vn/procedures/itemShelving_add.sql
View File

@ -21,7 +21,6 @@ BEGIN
SELECT barcodeToItem(vBarcode) INTO vItemFk;
SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
SET vQuantity = vQuantity * vPacking;
IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN

29
modules/item/back/methods/item-shelving/specs/upsertItem.spec.js
View File

@ -1,4 +1,4 @@
const {models} = require('vn-loopback/server/server');
const { models } = require('vn-loopback/server/server');
const LoopBackContext = require('loopback-context');
// #6276
@ -8,11 +8,11 @@ describe('ItemShelving upsertItem()', () => {
let options;
let tx;
beforeEach(async() => {
beforeEach(async () => {
ctx = {
req: {
accessToken: {userId: 9},
headers: {origin: 'http://localhost'}
accessToken: { userId: 9 },
headers: { origin: 'http://localhost' }
},
args: {}
};
@ -21,36 +21,37 @@ describe('ItemShelving upsertItem()', () => {
active: ctx.req
});
options = {transaction: tx};
options = { transaction: tx };
tx = await models.ItemShelving.beginTransaction({});
options.transaction = tx;
});
afterEach(async() => {
afterEach(async () => {
await tx.rollback();
});
xit('should add two new records', async() => {
it('should add two new records', async () => {
const shelvingFk = 'ZPP';
const items = [1, 1, 1, 2];
await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
const itemShelvings = await models.ItemShelving.find({where: {shelvingFk}}, options);
const itemShelvings = await models.ItemShelving.find({ where: { shelvingFk } }, options);
expect(itemShelvings.length).toEqual(2);
});
xit('should update the visible items', async() => {
it('should update the visible items', async () => {
const shelvingFk = 'GVC';
const items = [2, 2];
const {visible: itemsBefore} = await models.ItemShelving.findOne({
where: {shelvingFk, itemFk: items[0]}
const { visible: visibleItemsBefore } = await models.ItemShelving.findOne({
where: { shelvingFk, itemFk: items[0] }
}, options);
await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
const {visible: itemsAfter} = await models.ItemShelving.findOne({
where: {shelvingFk, itemFk: items[0]}
const { visible: visibleItemsAfter } = await models.ItemShelving.findOne({
where: { shelvingFk, itemFk: items[0] }
}, options);
expect(itemsAfter).toEqual(itemsBefore + 2);
expect(visibleItemsAfter).toEqual(visibleItemsBefore + 2);
});
});