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

14
modules/ticket/back/methods/sale-tracking/mark.js
View File

@ -86,19 +86,15 @@ module.exports = Self => {
await Self.updateTracking(ctx, saleFk, originalQuantity, code, isChecked, null, isScanned, myOptions); await Self.updateTracking(ctx, saleFk, originalQuantity, code, isChecked, null, isScanned, myOptions);
try {
const buy = await models.Buy.findById(buyFk, myOptions);
if (buy.itemOriginalFk) await models.SaleBuy.create({saleFk, buyFk}, myOptions);
} catch (e) {}
if (tx) await tx.commit(); if (tx) await tx.commit();
} catch (e) { } catch (e) {
if (tx) await tx.rollback(); if (tx) await tx.rollback();
throw new UserError($t('The line could not be marked')); throw new UserError($t('The line could not be marked'));
} }
const buy = await models.Buy.findOne({
where: {
id: buyFk,
itemOriginalFk: {neq: null}
}
});
if (buy) await models.SaleBuy.create({saleFk, buyFk});
}; };
}; };

2
modules/ticket/back/methods/sale-tracking/specs/mark.spec.js
View File

@ -1,5 +1,5 @@
const {models} = require('vn-loopback/server/server'); const {models} = require('vn-loopback/server/server');
fdescribe('saleTracking mark()', () => { describe('saleTracking mark()', () => {
const saleFk = 1; const saleFk = 1;
const originalQuantity = 10; const originalQuantity = 10;
const code = 'PREPARED'; const code = 'PREPARED';