diff --git a/modules/client/front/address/index/index.html b/modules/client/front/address/index/index.html index 8fdfce2bb8..ef3da40519 100644 --- a/modules/client/front/address/index/index.html +++ b/modules/client/front/address/index/index.html @@ -42,14 +42,15 @@ translate-attr="{title: 'Set as default'}"> -
{{::address.nickname}} - #{{::address.id}}
{{::address.street}}
- {{::address.postalCode}} - - {{::address.city}}, - {{::address.province.name}} + {{::address.postalCode}} - + {{::address.city}}, + {{::address.province.name}}, + {{::address.province.country.country}}
{{::address.phone}}, @@ -72,7 +73,7 @@ class="vn-hide-narrow vn-px-md border-solid-left" style="height: 6em; overflow: auto;"> - {{::observation.observationType.description}}: + {{::observation.observationType.description}}: {{::observation.description}} diff --git a/modules/client/front/address/index/index.js b/modules/client/front/address/index/index.js index 608bbbc202..4bad9d4c84 100644 --- a/modules/client/front/address/index/index.js +++ b/modules/client/front/address/index/index.js @@ -33,7 +33,13 @@ class Controller extends Section { }, { relation: 'province', scope: { - fields: ['id', 'name'] + fields: ['id', 'name', 'countryFk'], + include: { + relation: 'country', + scope: { + fields: ['id', 'country'] + } + } } } ]