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

fix send notification to salesPerson #1382
gitea/salix/dev This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-04-25 13:32:14 +02:00
parent b6c95f262f
commit aec46bb855
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/claim/back/methods/claim/regularizeClaim.js
View File

@ -70,14 +70,16 @@ module.exports = Self => {
discount: 100
}, {transaction: transaction});
await sendMessage(ctx, {
itemFk: sale.itemFk,
ticketFk: sale.ticketFk,
recipientFk: sale.item().itemType().worker().userFk,
quantity: sale.quantity,
concept: sale.concept,
nickname: address.nickname
}, transaction);
if (sale.ticket().client().salesPerson()) {
await sendMessage(ctx, {
itemFk: sale.itemFk,
ticketFk: sale.ticketFk,
recipientFk: sale.ticket().client().salesPerson().userFk,
quantity: sale.quantity,
concept: sale.concept,
nickname: address.nickname
}, transaction);
}
}
let claim = await Self.findById(params.claimFk);
@ -99,23 +101,14 @@ module.exports = Self => {
include: [
{
relation: 'ticket',
scope: {fields: ['warehouseFk', 'companyFk']}
},
{
relation: 'item',
scope: {
fields: ['typeFk'],
fields: ['clientFk', 'warehouseFk', 'companyFk'],
include: {
relation: 'itemType',
relation: 'client',
scope: {
fields: ['workerFk'],
include: {
relation: 'worker',
scope: {
fields: ['id', 'userFk'],
}
relation: 'salesPerson'
}
}
}
}