From 1e2e61234920f8fa3684ed854cf9ccbf005fbb99 Mon Sep 17 00:00:00 2001
From: TheCoreDev <laurent@thecoredev.fr>
Date: Fri, 16 Apr 2021 10:49:41 +0200
Subject: [PATCH] Modifs pour pb d'affichage des cartes en BO, pour
 PointRetrait et ClickAndCollect

---
 .../templates/backOffice/default/includes/cnc-main.html   | 2 +-
 .../templates/backOffice/default/js/cnc-main-js.html      | 8 ++++++++
 .../templates/backOffice/default/includes/main.html       | 2 +-
 .../templates/backOffice/default/js/main-js.html          | 8 ++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/local/modules/ClickAndCollect/templates/backOffice/default/includes/cnc-main.html b/local/modules/ClickAndCollect/templates/backOffice/default/includes/cnc-main.html
index 51562355..17f83b8f 100644
--- a/local/modules/ClickAndCollect/templates/backOffice/default/includes/cnc-main.html
+++ b/local/modules/ClickAndCollect/templates/backOffice/default/includes/cnc-main.html
@@ -189,7 +189,7 @@
         <div class="row">
             <div class="col-md-12">
                 <div id="map" class="locationMap"></div>
-                <script src="https://maps.googleapis.com/maps/api/js?key={module_config module='PlanificationLivraison' key='googlemap_api_key' locale='en_US'}&callback=initMap" async></script>
+                <script src="https://maps.googleapis.com/maps/api/js?key={module_config module='PlanificationLivraison' key='googlemap_api_key' locale='en_US'}" async></script>
             </div>
         </div>
 
diff --git a/local/modules/ClickAndCollect/templates/backOffice/default/js/cnc-main-js.html b/local/modules/ClickAndCollect/templates/backOffice/default/js/cnc-main-js.html
index f800a0bc..2aa9ded9 100644
--- a/local/modules/ClickAndCollect/templates/backOffice/default/js/cnc-main-js.html
+++ b/local/modules/ClickAndCollect/templates/backOffice/default/js/cnc-main-js.html
@@ -70,4 +70,12 @@
         });
     }
 
+    $(document).ready(function(){
+
+        if (typeof(google) !== 'undefined') {
+            if (typeof initMap === "function")
+                initMap();
+        }
+    });
+
 </script>
\ No newline at end of file
diff --git a/local/modules/PointRetrait/templates/backOffice/default/includes/main.html b/local/modules/PointRetrait/templates/backOffice/default/includes/main.html
index fd2b8d3a..292fffa6 100644
--- a/local/modules/PointRetrait/templates/backOffice/default/includes/main.html
+++ b/local/modules/PointRetrait/templates/backOffice/default/includes/main.html
@@ -185,7 +185,7 @@
         <div class="row">
             <div class="col-md-12">
                 <div id="map" class="locationMap"></div>
-                <script src="https://maps.googleapis.com/maps/api/js?key={module_config module='PlanificationLivraison' key='googlemap_api_key' locale='en_US'}&callback=initMap" async></script>
+                <script src="https://maps.googleapis.com/maps/api/js?key={module_config module='PlanificationLivraison' key='googlemap_api_key' locale='en_US'}" async></script>
             </div>
         </div>
 
diff --git a/local/modules/PointRetrait/templates/backOffice/default/js/main-js.html b/local/modules/PointRetrait/templates/backOffice/default/js/main-js.html
index 09dd6e7a..959e0db2 100644
--- a/local/modules/PointRetrait/templates/backOffice/default/js/main-js.html
+++ b/local/modules/PointRetrait/templates/backOffice/default/js/main-js.html
@@ -72,4 +72,12 @@
         });
     }
 
+    $(document).ready(function(){
+
+        if (typeof(google) !== 'undefined') {
+            if (typeof initMap === "function")
+                initMap();
+        }
+    });
+
 </script>
\ No newline at end of file