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

Merge branch 'dev' into test
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2024-05-27 07:18:04 +02:00
parent 1fe6816c08 29e800ea30
commit f869e7413c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (24.14.5) stable; urgency=low hedera-web (24.14.6) stable; urgency=low
* Initial Release. * Initial Release.

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

@ -65,8 +65,8 @@
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 name
</db-model> </db-model>
</htk-combo> </htk-combo>
</div> </div>

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

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "hedera-web", "name": "hedera-web",
"version": "24.14.5", "version": "24.14.6",
"description": "Verdnatura web page", "description": "Verdnatura web page",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {