refs #6915 test_master24_8 #2067

Merged
alexm merged 561 commits from test_master24_8 into master 2024-02-22 07:31:34 +00:00
1 changed files with 1 additions and 17 deletions
Showing only changes of commit 7c80a7bdda - Show all commits

View File

@ -13,21 +13,6 @@ module.exports = Self => {
description: 'The ticket id',
}
],
returns: [
{
arg: 'body',
type: 'file',
root: true
}, {
arg: 'Content-Type',
type: 'string',
http: {target: 'header'}
}, {
arg: 'Content-Disposition',
type: 'string',
http: {target: 'header'}
}
],
http: {
path: '/cmrEmail',
verb: 'POST'
@ -88,7 +73,7 @@ module.exports = Self => {
const response = await models.Dms.downloadFile(ctx, dms.id);
const email = new Email('cmr', params);
return email.send({
await email.send({
overrideAttachments: true,
attachments: [{
filename: `${ticket.cmrFk}.pdf`,
@ -97,7 +82,6 @@ module.exports = Self => {
});
}
if (tx) await tx.commit();
return;
} catch (e) {
if (tx) await tx.rollback();
throw e;