Merge pull request '3625-feat(ticket_log): add routeFk log' (#897) from 3625-ticket_log_routeFk into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #897 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
commit
19df1fe382
|
@ -121,5 +121,6 @@
|
||||||
"Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}",
|
"Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}",
|
||||||
"The type of business must be filled in basic data": "The type of business must be filled in basic data",
|
"The type of business must be filled in basic data": "The type of business must be filled in basic data",
|
||||||
"The worker has hours recorded that day": "The worker has hours recorded that day",
|
"The worker has hours recorded that day": "The worker has hours recorded that day",
|
||||||
"isWithoutNegatives": "isWithoutNegatives"
|
"isWithoutNegatives": "isWithoutNegatives",
|
||||||
|
"routeFk": "routeFk"
|
||||||
}
|
}
|
|
@ -158,7 +158,8 @@ module.exports = Self => {
|
||||||
'companyFk',
|
'companyFk',
|
||||||
'shipped',
|
'shipped',
|
||||||
'landed',
|
'landed',
|
||||||
'isDeleted'
|
'isDeleted',
|
||||||
|
'routeFk'
|
||||||
],
|
],
|
||||||
include: [
|
include: [
|
||||||
{
|
{
|
||||||
|
@ -169,6 +170,7 @@ module.exports = Self => {
|
||||||
}]
|
}]
|
||||||
}, myOptions);
|
}, myOptions);
|
||||||
|
|
||||||
|
args.routeFk = null;
|
||||||
const updatedTicket = Object.assign({}, args);
|
const updatedTicket = Object.assign({}, args);
|
||||||
delete updatedTicket.ctx;
|
delete updatedTicket.ctx;
|
||||||
delete updatedTicket.option;
|
delete updatedTicket.option;
|
||||||
|
|
Loading…
Reference in New Issue