From d8ea9134d4508fc96b56cfe40b107d1f5b2e2ee4 Mon Sep 17 00:00:00 2001 From: robert Date: Tue, 7 May 2024 07:29:00 +0200 Subject: [PATCH] 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"> - SELECT id, country FROM vn.country + SELECT id, name FROM vn.country ORDER BY country 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"> - 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