verdnatura/hedera-web
verdnatura
/
hedera-web
0
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

feat: refs #7039 change country to name
gitea/hedera-web/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Robert Ferrús 2024-05-07 07:29:00 +02:00
parent a96859b6bb
commit d8ea9134d4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forms/account/address/ui.xml
View File

@ -65,7 +65,7 @@
one-way="true" one-way="true"
one-time="true"> one-time="true">
<db-model property="model"> <db-model property="model">
SELECT id, country FROM vn.country SELECT id, name FROM vn.country
ORDER BY country ORDER BY country
</db-model> </db-model>
</htk-combo> </htk-combo>

2
forms/ecomerce/checkout/ui.xml
View File

@ -120,7 +120,7 @@
form-id="iter" form-id="iter"
on-change="onAddressChange"> on-change="onAddressChange">
<db-model property="model" id="addresses"> <db-model property="model" id="addresses">
SELECT a.id, a.nickname, p.name province, a.city, a.street, a.isActive, c.country SELECT a.id, a.nickname, p.name province, a.city, a.street, a.isActive, c.name
FROM myAddress a FROM myAddress a
LEFT JOIN vn.province p ON p.id = a.provinceFk LEFT JOIN vn.province p ON p.id = a.provinceFk
JOIN vn.country c ON c.id = p.countryFk JOIN vn.country c ON c.id = p.countryFk