verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

6296-countryAddress #1935

Merged
carlossa merged 5 commits from 6296-countryAddress into dev 2024-01-19 08:10:09 +00:00
Conversation 0 Commits 5 Files Changed 2 +12 -6
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 107dded411 - Show all commits

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

@ -47,9 +47,9 @@
<div class="ellipsize"><b>{{::address.nickname}} - #{{::address.id}}</b></div>
<div class="ellipsize" name="street">{{::address.street}}</div>
<div class="ellipsize">
<span ng-show="::address.postalCode">{{::address.postalCode}} -</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 class="ellipsize">
{{::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',
scope: {
fields: ['id', 'name']
fields: ['id', 'name', 'countryFk'],
include: {
relation: 'country',
scope: {
fields: ['id', 'country']
}
}
}
}
]