From d8ea9134d4508fc96b56cfe40b107d1f5b2e2ee4 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 7 May 2024 07:29:00 +0200
Subject: [PATCH 1/2] feat: refs #7039 change country to name

---
 forms/account/address/ui.xml   | 2 +-
 forms/ecomerce/checkout/ui.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forms/account/address/ui.xml b/forms/account/address/ui.xml
index 66c71144..ff216ee3 100644
--- a/forms/account/address/ui.xml
+++ b/forms/account/address/ui.xml
@@ -65,7 +65,7 @@
 				one-way="true"
 				one-time="true">
 				<db-model property="model">
-					SELECT id, country FROM vn.country
+					SELECT id, name FROM vn.country
 						ORDER BY country
 				</db-model>
 			</htk-combo>
diff --git a/forms/ecomerce/checkout/ui.xml b/forms/ecomerce/checkout/ui.xml
index 8506152f..cfe7f03e 100644
--- a/forms/ecomerce/checkout/ui.xml
+++ b/forms/ecomerce/checkout/ui.xml
@@ -120,7 +120,7 @@
 							form-id="iter"
 							on-change="onAddressChange">
 							<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
 										LEFT JOIN vn.province p ON p.id = a.provinceFk
 										JOIN vn.country c ON c.id = p.countryFk

From 359ddb5d180e55d89407f04cc75f544514c2490c Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 7 May 2024 14:05:44 +0200
Subject: [PATCH 2/2] Fix

---
 forms/account/address/ui.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/account/address/ui.xml b/forms/account/address/ui.xml
index ff216ee3..f18e96a5 100644
--- a/forms/account/address/ui.xml
+++ b/forms/account/address/ui.xml
@@ -66,7 +66,7 @@
 				one-time="true">
 				<db-model property="model">
 					SELECT id, name FROM vn.country
-						ORDER BY country
+						ORDER BY name
 				</db-model>
 			</htk-combo>
 		</div>