verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

Merge pull request '6296-countryAddress' (!1935) from 6296-countryAddress into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1935
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Carlos Satorres 2024-01-19 08:10:06 +00:00
parent 0a98cd7b23 882dd04adb
commit f42ce39112
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/client/front/address/index/index.html
View File

@ -49,7 +49,8 @@
<div class="ellipsize"> <div class="ellipsize">
<span ng-show="::address.postalCode">{{::address.postalCode}} -</span> <span ng-show="::address.postalCode">{{::address.postalCode}} -</span>
<span ng-show="::address.city">{{::address.city}},</span> <span ng-show="::address.city">{{::address.city}},</span>
{{::address.province.name}} <span ng-show="::address.province.name">{{::address.province.name}},</span>
{{::address.province.country.country}}
</div> </div>
<div class="ellipsize"> <div class="ellipsize">
{{::address.phone}}<span ng-if="::address.mobile">, </span> {{::address.phone}}<span ng-if="::address.mobile">, </span>

8
modules/client/front/address/index/index.js
View File

@ -33,7 +33,13 @@ class Controller extends Section {
}, { }, {
relation: 'province', relation: 'province',
scope: { scope: {
fields: ['id', 'name'] fields: ['id', 'name', 'countryFk'],
include: {
relation: 'country',
scope: {
fields: ['id', 'country']
}
}
} }
} }
] ]