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();