From 391132092a2ab2aae8988f5b1899f8c31db9e5f4 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Fri, 29 Sep 2023 09:53:09 +0200
Subject: [PATCH] Siae detail: show map in card when inbound deactivated

---
 lemarche/templates/siaes/_card_detail.html    |  6 +-
 lemarche/templates/siaes/_detail_cta.html     | 16 ++-
 .../templates/siaes/_useful_infos_siae.html   | 98 +++++++++++++------
 .../siaes/_useful_infos_siae_v2.html          | 87 ----------------
 4 files changed, 73 insertions(+), 134 deletions(-)
 delete mode 100644 lemarche/templates/siaes/_useful_infos_siae_v2.html

diff --git a/lemarche/templates/siaes/_card_detail.html b/lemarche/templates/siaes/_card_detail.html
index 8bef8078d..8a3a02c81 100644
--- a/lemarche/templates/siaes/_card_detail.html
+++ b/lemarche/templates/siaes/_card_detail.html
@@ -71,10 +71,6 @@ <h1 class="h2 mb-2">
         </div>
     </div>
     <div class="card-body" style="border-top:1px solid #e6e6eb">
-        {% if inbound_email_is_activated %}
-            {% include "siaes/_useful_infos_siae_v2.html" with siae=siae %}
-        {% else %}
-            {% include "siaes/_useful_infos_siae.html" with siae=siae %}
-        {% endif %}
+        {% include "siaes/_useful_infos_siae.html" with siae=siae %}
     </div>
 </div>
diff --git a/lemarche/templates/siaes/_detail_cta.html b/lemarche/templates/siaes/_detail_cta.html
index ca563096b..386d4284d 100644
--- a/lemarche/templates/siaes/_detail_cta.html
+++ b/lemarche/templates/siaes/_detail_cta.html
@@ -16,12 +16,6 @@ <h3>Ce prestataire vous intéresse ?</h3>
             </button>
             <div id="collapseCoordonnees" class="collapse mt-2">
                 <ul class="list-unstyled mb-0">
-                    {% if siae.is_missing_contact %}
-                        <li class="mb-2">
-                            <i class="ri-search-line"></i>
-                            <a href="https://www.google.fr/search?q={{ siae.name_display }}" id="company_google" target="_blank" rel="noopener">Google</a>
-                        </li>
-                    {% endif %}
                     {% if siae.user_count %}
                         {% if siae.contact_short_name %}
                             <li class="mb-2">
@@ -54,10 +48,12 @@ <h3>Ce prestataire vous intéresse ?</h3>
                             <a href="{{ siae.contact_social_website }}" id="company_social_website" target="_blank" rel="noopener">{{ siae.contact_social_website }}</a>
                         </li>
                     {% endif %}
-                    <li>
-                        <i class="ri-map-pin-line"></i>
-                        <span>{{ siae.address }} {{ siae.post_code }} {{ siae.city }}</span>
-                    </li>
+                    {% if siae.is_missing_contact %}
+                        <li class="mb-2">
+                            <i class="ri-search-line"></i>
+                            <a href="https://www.google.fr/search?q={{ siae.name_display }}" id="company_google" target="_blank" rel="noopener">Google</a>
+                        </li>
+                    {% endif %}
                 </ul>
             </div>
         {% else %}
diff --git a/lemarche/templates/siaes/_useful_infos_siae.html b/lemarche/templates/siaes/_useful_infos_siae.html
index 202aa6be8..9784d48b1 100644
--- a/lemarche/templates/siaes/_useful_infos_siae.html
+++ b/lemarche/templates/siaes/_useful_infos_siae.html
@@ -1,55 +1,89 @@
 {% load array_choices_display %}
+
 <div class="row">
+    <!-- First column -->
     <div class="col-12 col-md-6">
-        <div class="row">
-            <div class="col-12">
+        <ul class="list-unstyled mb-0">
+            <li class="mb-2">
                 <i class="ri-calendar-2-fill"></i>
                 <strong>Année de création :</strong>
                 <span>{{ siae.year_constitution_display }}</span>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-12">
+            </li>
+            <li class="mb-2">
                 <i class="ri-bill-line"></i>
                 <strong>SIRET :</strong>
                 <span>{{ siae.siret_display }}</span>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-12">
+            </li>
+            <li class="mb-2">
                 <i class="ri-money-euro-circle-line"></i>
                 <strong>Chiffre d'affaires :</strong>
                 <span>{{ siae.ca_display }}</span>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-12 mt-2 mb-2">
-                {% include "siaes/_annuaire_entreprises_button.html" with siret=siae.siret %}
-            </div>
-        </div>
-    </div>
-    <div class="col-12 col-md-6">
-        <div class="row">
-            <div class="col-12">
+            </li>
+            <li class="mb-2">
                 {% if siae.presta_type %}
-                    <i class="ri-briefcase-4-line"></i>
-                    <strong>{% array_choices_display siae 'presta_type' %}</strong>
+                <i class="ri-briefcase-4-line"></i>
+                <strong>{% array_choices_display siae 'presta_type' %}</strong>
                 {% endif %}
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-12">
+            </li>
+            <li class="mb-2">
                 <i class="ri-group-line"></i>
                 <strong>Salariés permanents :</strong>
                 <span>{{ siae.employees_permanent_count|default:"non disponible" }}</span>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-12">
+            </li>
+            <li class="mb-2">
                 <i class="ri-user-add-line"></i>
                 <strong>{{ siae.etp_count_label_display }} :</strong>
                 <span>{{ siae.etp_count_display|floatformat:0|default:"non disponible" }}</span>
-            </div>
+            </li>
+            {% if inbound_email_is_activated %}
+                {% if siae.contact_website %}
+                    <li class="mb-2">
+                        <i class="ri-window-2-line"></i>
+                        <a href="{{ siae.contact_website }}" id="company_website" target="_blank" rel="noopener">Site internet</a>
+                    </li>
+                {% endif %}
+                {% if siae.contact_social_website %}
+                    <li class="mb-2">
+                        <i class="ri-earth-line"></i>
+                        <a href="{{ siae.contact_social_website }}" id="company_social_website" target="_blank" rel="noopener">Réseau social</a>
+                    </li>
+                {% endif %}
+                {% if siae.is_missing_contact %}
+                    <li class="mb-2">
+                        <i class="ri-search-line"></i>
+                        <a href="https://www.google.fr/search?q={{ siae.name_display }}" id="company_google" target="_blank" rel="noopener">Google</a>
+                    </li>
+                {% endif %}
+            {% endif %}
+            <li class="mb-2">
+                {% include "siaes/_annuaire_entreprises_button.html" with siret=siae.siret %}
+            </li>
+        </ul>
+    </div>
+
+    <!-- Second column -->
+    <div class="col-12 col-md-6">
+        <div class="map-holder mb-3">
+            <div id="map-siae" class="map-canvas"></div>
+        </div>
+        <div class="map_details">
+            <ul class="list-unstyled m-0">
+                <li class="mb-2">
+                    <i class="ri-map-2-line"></i>
+                    <strong>Situé à :</strong>
+                    <span>{{ siae.city }}</span>
+                </li>
+                <li class="mb-2">
+                    <i class="ri-map-pin-line"></i>
+                    <strong>Adresse :</strong>
+                    <span>{{ siae.address }} {{ siae.post_code }} {{ siae.city }}</span>
+                </li>
+                <li class="mb-2">
+                    <i class="ri-focus-2-line"></i>
+                    <strong>Intervient sur :</strong>
+                    <span>{{ siae.geo_range_pretty_display }}</span>
+                </li>
+            </ul>
         </div>
     </div>
 </div>
diff --git a/lemarche/templates/siaes/_useful_infos_siae_v2.html b/lemarche/templates/siaes/_useful_infos_siae_v2.html
deleted file mode 100644
index 7dc66989e..000000000
--- a/lemarche/templates/siaes/_useful_infos_siae_v2.html
+++ /dev/null
@@ -1,87 +0,0 @@
-{% load array_choices_display %}
-
-<div class="row">
-    <!-- First column -->
-    <div class="col-12 col-md-6">
-        <ul class="list-unstyled mb-0">
-            <li class="mb-2">
-                <i class="ri-calendar-2-fill"></i>
-                <strong>Année de création :</strong>
-                <span>{{ siae.year_constitution_display }}</span>
-            </li>
-            <li class="mb-2">
-                <i class="ri-bill-line"></i>
-                <strong>SIRET :</strong>
-                <span>{{ siae.siret_display }}</span>
-            </li>
-            <li class="mb-2">
-                <i class="ri-money-euro-circle-line"></i>
-                <strong>Chiffre d'affaires :</strong>
-                <span>{{ siae.ca_display }}</span>
-            </li>
-            <li class="mb-2">
-                {% if siae.presta_type %}
-                <i class="ri-briefcase-4-line"></i>
-                <strong>{% array_choices_display siae 'presta_type' %}</strong>
-                {% endif %}
-            </li>
-            <li class="mb-2">
-                <i class="ri-group-line"></i>
-                <strong>Salariés permanents :</strong>
-                <span>{{ siae.employees_permanent_count|default:"non disponible" }}</span>
-            </li>
-            <li class="mb-2">
-                <i class="ri-user-add-line"></i>
-                <strong>{{ siae.etp_count_label_display }} :</strong>
-                <span>{{ siae.etp_count_display|floatformat:0|default:"non disponible" }}</span>
-            </li>
-            {% if siae.contact_website %}
-                <li class="mb-2">
-                    <i class="ri-window-2-line"></i>
-                    <a href="{{ siae.contact_website }}" id="company_website" target="_blank" rel="noopener">Site internet</a>
-                </li>
-            {% endif %}
-            {% if siae.contact_social_website %}
-                <li class="mb-2">
-                    <i class="ri-earth-line"></i>
-                    <a href="{{ siae.contact_social_website }}" id="company_social_website" target="_blank" rel="noopener">Réseau social</a>
-                </li>
-            {% endif %}
-            {% if siae.is_missing_contact %}
-                <li class="mb-2">
-                    <i class="ri-search-line"></i>
-                    <a href="https://www.google.fr/search?q={{ siae.name_display }}" id="company_google" target="_blank" rel="noopener">Google</a>
-                </li>
-            {% endif %}
-            <li class="mb-2">
-                {% include "siaes/_annuaire_entreprises_button.html" with siret=siae.siret %}
-            </li>
-        </ul>
-    </div>
-
-    <!-- Second column -->
-    <div class="col-12 col-md-6">
-        <div class="map-holder mb-3">
-            <div id="map-siae" class="map-canvas"></div>
-        </div>
-        <div class="map_details">
-            <ul class="list-unstyled m-0">
-                <li class="mb-2">
-                    <i class="ri-map-2-line"></i>
-                    <strong>Situé à :</strong>
-                    <span>{{ siae.city }}</span>
-                </li>
-                <li class="mb-2">
-                    <i class="ri-map-pin-line"></i>
-                    <strong>Adresse :</strong>
-                    <span>{{ siae.address }} {{ siae.post_code }} {{ siae.city }}</span>
-                </li>
-                <li class="mb-2">
-                    <i class="ri-focus-2-line"></i>
-                    <strong>Intervient sur :</strong>
-                    <span>{{ siae.geo_range_pretty_display }}</span>
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>