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

Merge pull request 'Html changes' (#356) from 2386-2380_html_fixes into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #356
This commit is contained in:
Joan Sanchez 2020-08-24 06:32:09 +00:00
parent 519580161e 957c1c01b9
commit b2886bdca8
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,11 @@
style="overflow: hidden; min-width: 14em;"> style="overflow: hidden; min-width: 14em;">
<div class="ellipsize"><b>{{::address.nickname}} - #{{::address.id}}</b></div> <div class="ellipsize"><b>{{::address.nickname}} - #{{::address.id}}</b></div>
<div class="ellipsize" name="street">{{::address.street}}</div> <div class="ellipsize" name="street">{{::address.street}}</div>
<div class="ellipsize">{{::address.city}}, {{::address.province.name}}</div> <div class="ellipsize">
<span ng-show="::address.postalCode">{{::address.postalCode}} -</span>
<span ng-show="::address.city">{{::address.city}},</span>
{{::address.province.name}}
</div>
<div class="ellipsize"> <div class="ellipsize">
{{::address.phone}}<span ng-if="::address.mobile">, </span> {{::address.phone}}<span ng-if="::address.mobile">, </span>
{{::address.mobile}} {{::address.mobile}}

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

@ -16,7 +16,8 @@ class Controller extends Section {
'provinceFk', 'provinceFk',
'phone', 'phone',
'mobile', 'mobile',
'isEqualizated' 'isEqualizated',
'postalCode'
], ],
order: [ order: [
'isDefaultAddress DESC', 'isDefaultAddress DESC',

2
modules/route/front/summary/index.html
View File

@ -71,7 +71,7 @@
<span <span
ng-click="ticketDescriptor.show($event, ticket.id)" ng-click="ticketDescriptor.show($event, ticket.id)"
class="link"> class="link">
{{ticket.id | zeroFill:6}} {{ticket.id}}
</span> </span>
</vn-td> </vn-td>
<vn-td> <vn-td>