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

fix: refs #7028 fix confirm deny #3290

Merged
carlossa merged 23 commits from 7028-itemRequestConfDeny into dev 2024-12-16 10:59:56 +00:00
Conversation 0 Commits 23 Files Changed 2 +22 -19
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1e471ac20f - Show all commits

23
modules/ticket/back/methods/ticket-request/confirm.js
View File

@ -97,18 +97,19 @@ module.exports = Self => {
const query = `CALL vn.sale_calculateComponent(?, NULL)`;
await Self.rawSql(query, [sale.id], myOptions);
const url = await Self.app.models.Url.getUrl();
const requesterId = request.ticket().client().salesPersonFk;
alexm commented 2024-12-16 10:39:51 +00:00
Outdated
Review
Copy Link

const salesPerson

const salesPerson
const message = $t('Bought units from buy request', {
quantity: sale.quantity,
concept: sale.concept,
itemId: sale.itemFk,
ticketId: sale.ticketFk,
url: `${url}ticket/${sale.ticketFk}/summary`,
urlItem: `${url}item/${sale.itemFk}/summary`
});
await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
if (requesterId) {
const url = await Self.app.models.Url.getUrl();
const message = $t('Bought units from buy request', {
quantity: sale.quantity,
concept: sale.concept,
itemId: sale.itemFk,
ticketId: sale.ticketFk,
url: `${url}ticket/${sale.ticketFk}/summary`,
urlItem: `${url}item/${sale.itemFk}/summary`
});
await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
}
if (tx) await tx.commit();
return sale;

18
modules/ticket/back/methods/ticket-request/deny.js
View File

@ -65,16 +65,18 @@ module.exports = Self => {
}
}, myOptions);
const url = await models.Url.getUrl();
const requesterId = request.ticket().client().salesPersonFk;
alexm commented 2024-12-16 10:39:58 +00:00
Outdated
Review
Copy Link

const salesPerson

const salesPerson
const message = $t('Deny buy request', {
ticketId: request.ticketFk,
url: `${url}ticket/${request.ticketFk}/request/index`,
observation: params.response
});
if (requesterId) {
const url = await models.Url.getUrl();
const message = $t('Deny buy request', {
ticketId: request.ticketFk,
url: `${url}ticket/${request.ticketFk}/request/index`,
observation: params.response
});
await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
await request.updateAttributes(params, myOptions);
await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
await request.updateAttributes(params, myOptions);
}
carlossa marked this conversation as resolved Outdated
alexm commented 2024-12-12 06:02:15 +00:00
Outdated
Review
Copy Link

, myOptions);

, myOptions);
if (tx) await tx.commit();