Merge pull request 'fixes #5141 Añadir Provincia del consignatario en Claim/Descriptor' (!1270) from 5141-provincia-consignatario into dev
gitea/salix/pipeline/head This commit looks good Details

Reviewed-on: #1270
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Alexandre Riera 2023-01-27 08:00:49 +00:00
commit daf3d4b52f
2 changed files with 25 additions and 5 deletions

View File

@ -19,10 +19,26 @@ class Controller extends ModuleCard {
}, {
relation: 'ticket',
scope: {
fields: ['zoneFk'],
include: {
relation: 'zone'
}
fields: ['zoneFk', 'addressFk'],
include: [
{
relation: 'zone',
scope: {
fields: ['name']
}
},
{
relation: 'address',
scope: {
fields: ['provinceFk'],
include: {
relation: 'province',
scope: {
fields: ['name']
}
}
}
}]
}
}, {
relation: 'claimState',

View File

@ -55,9 +55,13 @@
<span
ng-click="zoneDescriptor.show($event, $ctrl.claim.ticket.zoneFk)"
class="link">
{{$ctrl.claim.ticket.zoneFk}}
{{$ctrl.claim.ticket.zone.name}}
</span>
</vn-label-value>
<vn-label-value
label="Province"
value="{{$ctrl.claim.ticket.address.province.name}}">
</vn-label-value>
<vn-label-value
label="Ticket">
<span