verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 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

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

@ -42,14 +42,15 @@
translate-attr="{title: 'Set as default'}">
</vn-icon-button>
</vn-none>
<vn-one
<vn-one
style="overflow: hidden; min-width: 14em;">
<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.postalCode">{{::address.postalCode}} -</span>
<span ng-show="::address.city">{{::address.city}},</span>
<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>
@ -72,7 +73,7 @@
class="vn-hide-narrow vn-px-md border-solid-left"
style="height: 6em; overflow: auto;">
<vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'vn-pt-sm': $index}">
<b>{{::observation.observationType.description}}:</b>
<b>{{::observation.observationType.description}}:</b>
<span>{{::observation.description}}</span>
</vn-one>
</vn-vertical>

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']
}
}
}
}
]