google maps now mandates an api key so add to general store settings/…

…location and smarty function google_maps
exponentcms · Apr 7, 2017 · 373fd7f · 373fd7f
1 parent 289f474
commit 373fd7f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/framework/modules/ecommerce/views/ecomconfig/configure.bootstrap3.tpl b/framework/modules/ecommerce/views/ecomconfig/configure.bootstrap3.tpl
@@ -115,6 +115,7 @@
                     <div id="tab7" role="tabpanel" class="tab-pane fade">
                         <h2>{'General Location Settings'|gettext}</h2>
                         {control type="checkbox" name="address_allow_admins_all" label="Allow admins access to the full geographical data regardless of other settings?"|gettext value=1 checked=$config.address_allow_admins_all}
+                        {control type="text" name="map_apikey" label="Google Maps API Key"|gettext value=$config.map_apikey}
                     </div>
                     <div id="tab8" role="tabpanel" class="tab-pane fade">
                         <h2>{"Product Feeds Settings"|gettext}</h2>

diff --git a/framework/modules/ecommerce/views/ecomconfig/configure.tpl b/framework/modules/ecommerce/views/ecomconfig/configure.tpl
@@ -115,6 +115,7 @@
                     <div id="tab7">
                         <h2>{'General Location Settings'|gettext}</h2>
                         {control type="checkbox" name="address_allow_admins_all" label="Allow admins access to the full geographical data regardless of other settings?"|gettext value=1 checked=$config.address_allow_admins_all}
+                        {control type="text" name="map_apikey" label="Google Maps API Key"|gettext value=$config.map_apikey}
                     </div>
                     <div id="tab8">
                         <h2>{"Product Feeds Settings"|gettext}</h2>

diff --git a/framework/plugins/function.google_map.php b/framework/plugins/function.google_map.php
@@ -94,7 +94,7 @@ function smarty_function_google_map($params,&$smarty) {
     expJavascript::pushToFoot(array(
         "unique"=>'0-gmaps',
         "jquery"=>1,
-        "src"=>'http://maps.google.com/maps/api/js'
+        "src"=>'http://maps.google.com/maps/api/js?key=' . ecomconfig::getConfig('map_apikey')
      ));
     expJavascript::pushToFoot(array(
         "unique"=>'gmap-' . $params['unique'],