diff --git a/client/ticket/src/list/ticket-list.html b/client/ticket/src/list/ticket-list.html index 87304ee15..7371d636e 100644 --- a/client/ticket/src/list/ticket-list.html +++ b/client/ticket/src/list/ticket-list.html @@ -45,7 +45,7 @@ {{::ticket.shipped | date:'HH:MM'}} {{::ticket.nickname}} {{::ticket.address.province.name}} - {{::ticket.ticketTracking.state.name}} + {{::ticket.tracking.state.name}} {{::ticket.agencyMode.name}} {{::ticket.warehouse.name}} {{::ticket.refFk | dashIfEmpty}} diff --git a/client/ticket/src/summary/ticket-summary.html b/client/ticket/src/summary/ticket-summary.html index 764df26af..01043890d 100644 --- a/client/ticket/src/summary/ticket-summary.html +++ b/client/ticket/src/summary/ticket-summary.html @@ -6,7 +6,7 @@ + value="{{$ctrl.summary.tracking.state.name}}"> diff --git a/services/loopback/common/methods/ticket/filter.js b/services/loopback/common/methods/ticket/filter.js index 5bada154f..8c0ba8c52 100644 --- a/services/loopback/common/methods/ticket/filter.js +++ b/services/loopback/common/methods/ticket/filter.js @@ -30,7 +30,7 @@ module.exports = Self => { fields: ['name'] } }, { - relation: 'ticketTracking', + relation: 'tracking', scope: { fields: ['stateFk'], include: { diff --git a/services/loopback/common/methods/ticket/summary.js b/services/loopback/common/methods/ticket/summary.js index 030b846f6..74018843b 100644 --- a/services/loopback/common/methods/ticket/summary.js +++ b/services/loopback/common/methods/ticket/summary.js @@ -57,7 +57,7 @@ module.exports = Self => { } }, { - relation: 'ticketTracking', + relation: 'tracking', scope: { fields: ['stateFk'], include: { diff --git a/services/loopback/common/models/ticket.json b/services/loopback/common/models/ticket.json index d516e7e20..60af8bcc1 100644 --- a/services/loopback/common/models/ticket.json +++ b/services/loopback/common/models/ticket.json @@ -77,7 +77,7 @@ "model": "TicketPackaging", "foreignKey": "ticketFk" }, - "ticketTracking": { + "tracking": { "type": "hasOne", "model": "TicketTracking", "foreignKey": "ticketFk"