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

refs #6915 master into test #2092

Merged
juan merged 22 commits from master into test 2024-02-23 18:02:08 +00:00
Conversation 0 Commits 22 Files Changed 18 +9 -6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 94b49efb1f - Show all commits

13
back/methods/mrw-config/createShipment.js
View File

@ -25,12 +25,15 @@ module.exports = Self => {
Self.createShipment = async(expeditionFk, options) => { Self.createShipment = async(expeditionFk, options) => {
const myOptions = {}; const myOptions = {};
let tx;
if (typeof options == 'object') if (typeof options == 'object')
Object.assign(myOptions, options); Object.assign(myOptions, options);
if (!myOptions.transaction) if (!myOptions.transaction) {
myOptions.transaction = await Self.beginTransaction({}); tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
const models = Self.app.models; const models = Self.app.models;
const mrw = await models.MrwConfig.findOne(null, myOptions); const mrw = await models.MrwConfig.findOne(null, myOptions);
@ -88,10 +91,10 @@ module.exports = Self => {
try { try {
await models.Expedition.updateAll({id: expeditionFk}, {externalId: shipmentId}, myOptions); await models.Expedition.updateAll({id: expeditionFk}, {externalId: shipmentId}, myOptions);
await myOptions.transaction.commit(); if (tx) await tx.commit();
} catch (error) { } catch (error) {
await myOptions.transaction.rollback(); if (tx) await tx.rollback();
throw new UserError(`Cant update the expedition`); throw new UserError(`Cant update `);
} }
return file; return file;
}; };

2
back/methods/mrw-config/specs/createShipment.spec.js
View File

@ -31,7 +31,7 @@ const expedition1 = {
let tx; let tx;
let options; let options;
describe('MRWConfig createShipment()', () => { fdescribe('MRWConfig createShipment()', () => {
beforeEach(async() => { beforeEach(async() => {
options = tx = undefined; options = tx = undefined;
tx = await models.MrwConfig.beginTransaction({}); tx = await models.MrwConfig.beginTransaction({});