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

8355-testToMaster #3336

Merged
alexm merged 241 commits from 8355-testToMaster into master 2025-01-07 06:44:57 +00:00
Conversation 0 Commits 241 Files Changed 87 +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)`; const query = `CALL vn.sale_calculateComponent(?, NULL)`;
await Self.rawSql(query, [sale.id], myOptions); await Self.rawSql(query, [sale.id], myOptions);
const url = await Self.app.models.Url.getUrl();
const requesterId = request.ticket().client().salesPersonFk; const requesterId = request.ticket().client().salesPersonFk;
const message = $t('Bought units from buy request', { if (requesterId) {
quantity: sale.quantity, const url = await Self.app.models.Url.getUrl();
concept: sale.concept, const message = $t('Bought units from buy request', {
itemId: sale.itemFk, quantity: sale.quantity,
ticketId: sale.ticketFk, concept: sale.concept,
url: `${url}ticket/${sale.ticketFk}/summary`, itemId: sale.itemFk,
urlItem: `${url}item/${sale.itemFk}/summary` ticketId: sale.ticketFk,
}); url: `${url}ticket/${sale.ticketFk}/summary`,
await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions); urlItem: `${url}item/${sale.itemFk}/summary`
});
await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
}
if (tx) await tx.commit(); if (tx) await tx.commit();
return sale; return sale;

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

@ -65,16 +65,18 @@ module.exports = Self => {
} }
}, myOptions); }, myOptions);
const url = await models.Url.getUrl();
const requesterId = request.ticket().client().salesPersonFk; const requesterId = request.ticket().client().salesPersonFk;
const message = $t('Deny buy request', { if (requesterId) {
ticketId: request.ticketFk, const url = await models.Url.getUrl();
url: `${url}ticket/${request.ticketFk}/request/index`, const message = $t('Deny buy request', {
observation: params.response ticketId: request.ticketFk,
}); url: `${url}ticket/${request.ticketFk}/request/index`,
observation: params.response
});
await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions); await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
await request.updateAttributes(params, myOptions); await request.updateAttributes(params, myOptions);
}
if (tx) await tx.commit(); if (tx) await tx.commit();