From a37314282781bbbc6fc355fec80319404e576955 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 9 Nov 2021 11:38:20 +0100
Subject: [PATCH 1/3] display of incomplete address changed

---
 .../Resources/views/Entity/address.html.twig    | 17 +++++++++++++++++
 .../translations/messages.fr.yml                |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index 104f46b27..b915daf1a 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -58,6 +58,13 @@
 
 {% macro inline(address, options) %}
     {% if options['has_no_address'] == true and address.isNoAddress == true %}
+        {% if address.postCode is not empty %}
+            <p class="postcode">
+                <span class="code">{{ address.postCode.code }}</span>
+                <span class="name">{{ address.postCode.name }}</span>
+            </p>
+            <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
+        {% endif %}
         <span class="noaddress">
             {{ 'address.consider homeless'|trans }}
         </span>
@@ -108,9 +115,19 @@
 {%- if render == 'bloc' -%}
     <div class="chill-entity entity-address">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
+            {% if address.postCode is not empty %}
+            <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
+                <p class="postcode">
+                    <span class="code">{{ address.postCode.code }}</span>
+                    <span class="name">{{ address.postCode.name }}</span>
+                </p>
+                <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
+            </div>    
+            {% endif %}
             <div class="noaddress">
                 {{ 'address.consider homeless'|trans }}
             </div>
+        
         {% else %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
                 {% if options['with_picto'] %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 7737e1d04..7f7801805 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -74,7 +74,7 @@ Choose a postal code: Choisir un code postal
 address:
   address_homeless: L'adresse est-elle celle d'un domicile fixe ?
   real address: Adresse d'un domicile
-  consider homeless: N'est pas l'adresse d'un domicile (SDF)
+  consider homeless: Cette addresse est incomplète
 address more:
   floor: ét
   corridor: coul

From 16512a1ca1b0e499f9f9930ed5ac9576b1c4f983 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 9 Nov 2021 11:44:36 +0100
Subject: [PATCH 2/3] changelog updated

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c85f102b..30a2c52df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ and this project adheres to
 
 ## Unreleased
 
-<!-- write down unreleased development here -->
+* [address]: Display of incomplete address adjusted.
 
 
 

From 2b0093a351d8cd01c8b3c8f80d95018ae1af0fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 12 Nov 2021 12:08:48 +0000
Subject: [PATCH 3/3] fix typo

---
 src/Bundle/ChillMainBundle/translations/messages.fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 7f7801805..082e4c83f 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -74,7 +74,7 @@ Choose a postal code: Choisir un code postal
 address:
   address_homeless: L'adresse est-elle celle d'un domicile fixe ?
   real address: Adresse d'un domicile
-  consider homeless: Cette addresse est incomplète
+  consider homeless: Cette adresse est incomplète
 address more:
   floor: ét
   corridor: coul