[freeside-commits] branch master updated. e1acfb2921b35fe097015208e8072a2675d01d69

[Jonathan Prykop]

The branch, master has been updated
       via  e1acfb2921b35fe097015208e8072a2675d01d69 (commit)
      from  495da424492b18c3f4cdaa3fccec728b14435fde (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e1acfb2921b35fe097015208e8072a2675d01d69
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Fri Sep 23 19:00:29 2016 -0500

    71873: GlobalVision - directions

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 2da69f8..57761bb 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2069,6 +2069,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'google_maps_api_key',
+    'section'     => 'addresses',
+    'description' => 'API key for google maps.  This must be set for map and directions links to appear on customer pages.  See <a href="https://developers.google.com/maps/documentation/javascript/get-api-key">Getting a Google Maps API Key</a>',
+    'type'        => 'text',
+  },
+
+  {
     'key'         => 'show_ship_company',
     'section'     => 'addresses',
     'description' => 'Turns on display/collection of a "service company name" field for customers.',
diff --git a/httemplate/elements/coord-links.html b/httemplate/elements/coord-links.html
index 45b8132..a755791 100644
--- a/httemplate/elements/coord-links.html
+++ b/httemplate/elements/coord-links.html
@@ -1,5 +1,7 @@
 <& /elements/init_overlib.html &>
 
+% if ( $apikey ) {
+
 <& /elements/popup_link.html,
      'action'      => $p. 'view/map.html?'. $query,
      'label'       => mt('map'),
@@ -19,6 +21,8 @@
   &>
 % }
 
+% } # end if $apikey
+
 <A HREF="<%$p%>view/kml.cgi?<% $query %>"><% mt('earth') |h %></A>
 
 <%init>
@@ -45,10 +49,13 @@ $m->interp->apply_escapes($js_name, 'js_string');
 $js_name =~ s/^'//;
 $js_name =~ s/'$//;
 
+my $conf = new FS::Conf;
+my $apikey = $conf->config('google_maps_api_key');
+
 #for directions link
 my @origin = $opt{company_address}
                ? @{ $opt{company_address} }
-               : FS::Conf->new->config('company_address', $agentnum);
+               : $conf->config('company_address', $agentnum);
 my $origin = uri_escape(join(',', @origin));
 
 </%init>
diff --git a/httemplate/view/directions.html b/httemplate/view/directions.html
index f14a11a..a07df40 100644
--- a/httemplate/view/directions.html
+++ b/httemplate/view/directions.html
@@ -38,8 +38,9 @@ body { height: 100%; margin: 0px; padding: 0px }
 }
 </style>
 
-<script type="text/javascript" 
-src="https://maps.google.com/maps/api/js?v=3.4&sensor=false">
+% my $conf = new FS::Conf;
+% my $apikey = $conf->config('google_maps_api_key');
+<script type="text/javascript" src="https://maps.google.com/maps/api/js?v=3&key=<% $apikey %>">
 </script>
 
 <script type="text/javascript">
@@ -62,6 +63,8 @@ function show_route() {
   directionsService.route(directionsRequest, function(result, status) {
     if ( status == google.maps.DirectionsStatus.OK ) {
       directionsDisplay.setDirections(result);
+    } else { 
+      document.body.innerHTML = ('<P STYLE="color: red;">Directions lookup failed with the following error: '+status+'</P>');
     }
   });
 }
diff --git a/httemplate/view/map.html b/httemplate/view/map.html
index 3122de6..d996a33 100644
--- a/httemplate/view/map.html
+++ b/httemplate/view/map.html
@@ -22,8 +22,9 @@ body { height: 100%; margin: 0px; padding: 0px }
 @media print { #map_canvas { height: 500px; margin: 0; } }
 </style>
 
-<script type="text/javascript" 
-src="https://maps.google.com/maps/api/js?v=3.4&sensor=false">
+% my $conf = new FS::Conf;
+% my $apikey = $conf->config('google_maps_api_key');
+<script type="text/javascript" src="https://maps.google.com/maps/api/js?v=3&key=<% $apikey %>">
 </script>
 
 <script type="text/javascript">

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm                        |    7 +++++++
 httemplate/elements/coord-links.html |    9 ++++++++-
 httemplate/view/directions.html      |    7 +++++--
 httemplate/view/map.html             |    5 +++--
 4 files changed, 23 insertions(+), 5 deletions(-)