From 0c6829842a5850b31dd75fed84c527107d69b9a7 Mon Sep 17 00:00:00 2001
From: TheCoreDev <laurent@thecoredev.fr>
Date: Mon, 21 Jun 2021 09:49:05 +0200
Subject: [PATCH] =?UTF-8?q?Modif=20pour=20n'avoir=20qu'un=20seul=20appel?=
 =?UTF-8?q?=20=C3=A0=20l'API=20GoogleMaps,=20si=20les=20modules=20Colissim?=
 =?UTF-8?q?o=20et=20MondialRelay=20sont=20tous=20deux=20actifs.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/mondialrelay/order-delivery-extra.html     |  8 ++++----
 .../templates/frontOffice/default/socolissimo.html     | 10 ++++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/order-delivery-extra.html b/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/order-delivery-extra.html
index 07b0595a..17a709c2 100644
--- a/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/order-delivery-extra.html
+++ b/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/order-delivery-extra.html
@@ -151,7 +151,7 @@
             {/for}
         ]
     };
-
+/*
     function loadScript() {
         var script = document.createElement('script');
         script.type = 'text/javascript';
@@ -161,7 +161,7 @@
         script.async = true;
         document.body.appendChild(script);
     }
-    
+ */
     function loadRelayMap() {
         var $relayInfo = $('#relay_info');
         
@@ -268,13 +268,13 @@
         });
     }
 
-
+/*
     if (typeof(google) === 'undefined') {
         loadScript();
     } else {
         mondialRelaySetup();
     }
-
+*/
     function mondialRelaySetup() {
         // Google Map
         var MRData_mapOptions = {
diff --git a/local/modules/SoColissimo/templates/frontOffice/default/socolissimo.html b/local/modules/SoColissimo/templates/frontOffice/default/socolissimo.html
index b7db2a1c..74f11ac0 100644
--- a/local/modules/SoColissimo/templates/frontOffice/default/socolissimo.html
+++ b/local/modules/SoColissimo/templates/frontOffice/default/socolissimo.html
@@ -443,7 +443,7 @@
         var script = document.createElement('script');
         script.type = 'text/javascript';
         script.src = 'https://maps.googleapis.com/maps/api/js'
-        + '?callback=SoColissimoInitialize'
+        + '?callback=initMaps'
         + '&key={config key="socolissimo_google_map_key"}';
         script.async = true;
         document.body.appendChild(script);
@@ -452,9 +452,15 @@
     if (typeof(google) == 'undefined') {
         loadScript();
     } else {
-        SoColissimoInitialize();
+        initMaps();
     }
 
+    function initMaps() {
+        if (typeof SoColissimoInitialize === "function")   SoColissimoInitialize();
+        if (typeof mondialRelaySetup === "function")       mondialRelaySetup();
+    }
+
+
     function SoColissimoInitialize() {
         if (typeof initialize_so == 'function') {
             initialize_so();