From 107dded4114a6d027a172d5d4ea216df961d13e5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 15 Jan 2024 09:03:56 +0100
Subject: [PATCH 1/2] refs #6296 countryAddress

---
 modules/client/front/address/index/index.html | 10 +++++-----
 modules/client/front/address/index/index.js   |  8 +++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/client/front/address/index/index.html b/modules/client/front/address/index/index.html
index 8fdfce2bb..989ce13a9 100644
--- a/modules/client/front/address/index/index.html
+++ b/modules/client/front/address/index/index.html
@@ -42,14 +42,14 @@
                     translate-attr="{title: 'Set as default'}">
                 </vn-icon-button>
             </vn-none>
-            <vn-one 
+            <vn-one
                 style="overflow: hidden; min-width: 14em;">
                 <div class="ellipsize"><b>{{::address.nickname}} - #{{::address.id}}</b></div>
                 <div class="ellipsize" name="street">{{::address.street}}</div>
                 <div class="ellipsize">
-                    <span ng-show="::address.postalCode">{{::address.postalCode}} -</span> 
-                    <span ng-show="::address.city">{{::address.city}},</span> 
-                    {{::address.province.name}}
+                    <span ng-show="::address.city">{{::address.city}},</span>
+                    <span ng-show="::address.province.name">{{::address.province.name}},</span>
+                    {{::address.province.country.country}}
                 </div>
                 <div class="ellipsize">
                     {{::address.phone}}<span ng-if="::address.mobile">, </span>
@@ -72,7 +72,7 @@
                 class="vn-hide-narrow vn-px-md border-solid-left"
                 style="height: 6em; overflow: auto;">
                 <vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'vn-pt-sm': $index}">
-                    <b>{{::observation.observationType.description}}:</b> 
+                    <b>{{::observation.observationType.description}}:</b>
                     <span>{{::observation.description}}</span>
                 </vn-one>
             </vn-vertical>
diff --git a/modules/client/front/address/index/index.js b/modules/client/front/address/index/index.js
index 608bbbc20..4bad9d4c8 100644
--- a/modules/client/front/address/index/index.js
+++ b/modules/client/front/address/index/index.js
@@ -33,7 +33,13 @@ class Controller extends Section {
                 }, {
                     relation: 'province',
                     scope: {
-                        fields: ['id', 'name']
+                        fields: ['id', 'name', 'countryFk'],
+                        include: {
+                            relation: 'country',
+                            scope: {
+                                fields: ['id', 'country']
+                            }
+                        }
                     }
                 }
             ]

From 75259984771994568b67a906ef36a2ad320e6656 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 17 Jan 2024 14:13:09 +0100
Subject: [PATCH 2/2] refs #6296 postal code

---
 modules/client/front/address/index/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/client/front/address/index/index.html b/modules/client/front/address/index/index.html
index 989ce13a9..ef3da4051 100644
--- a/modules/client/front/address/index/index.html
+++ b/modules/client/front/address/index/index.html
@@ -47,6 +47,7 @@
                 <div class="ellipsize"><b>{{::address.nickname}} - #{{::address.id}}</b></div>
                 <div class="ellipsize" name="street">{{::address.street}}</div>
                 <div class="ellipsize">
+                    <span ng-show="::address.postalCode">{{::address.postalCode}} -</span>
                     <span ng-show="::address.city">{{::address.city}},</span>
                     <span ng-show="::address.province.name">{{::address.province.name}},</span>
                     {{::address.province.country.country}}