Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
gitea/salix/dev This commit looks good
Details
This commit is contained in:
commit
d1a179c1c3
|
@ -73,7 +73,7 @@ module.exports = Self => {
|
||||||
await sendMessage(ctx, {
|
await sendMessage(ctx, {
|
||||||
itemFk: sale.itemFk,
|
itemFk: sale.itemFk,
|
||||||
ticketFk: sale.ticketFk,
|
ticketFk: sale.ticketFk,
|
||||||
workerFk: sale.item().itemType().workerFk,
|
recipientFk: sale.item().itemType().worker().userFk,
|
||||||
quantity: sale.quantity,
|
quantity: sale.quantity,
|
||||||
concept: sale.concept,
|
concept: sale.concept,
|
||||||
nickname: address.nickname
|
nickname: address.nickname
|
||||||
|
@ -107,7 +107,16 @@ module.exports = Self => {
|
||||||
fields: ['typeFk'],
|
fields: ['typeFk'],
|
||||||
include: {
|
include: {
|
||||||
relation: 'itemType',
|
relation: 'itemType',
|
||||||
scope: {fields: ['workerFk']}
|
scope: {
|
||||||
|
fields: ['workerFk'],
|
||||||
|
include: {
|
||||||
|
relation: 'worker',
|
||||||
|
scope: {
|
||||||
|
fields: ['id', 'userFk'],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}],
|
}],
|
||||||
|
@ -152,7 +161,7 @@ module.exports = Self => {
|
||||||
+ `"${params.nickname}" provenientes del ticket #${params.ticketFk}`;
|
+ `"${params.nickname}" provenientes del ticket #${params.ticketFk}`;
|
||||||
|
|
||||||
await Self.app.models.Message.send(ctx, {
|
await Self.app.models.Message.send(ctx, {
|
||||||
recipientFk: params.workerFk,
|
recipientFk: params.recipientFk,
|
||||||
message: message
|
message: message
|
||||||
}, {transaction: transaction});
|
}, {transaction: transaction});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue