directions to customer address, #16585

[freeside.git] / httemplate / view / svc_broadband.cgi

diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 2e93d42..961374e 100644 (file)
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -27,7 +27,7 @@ $labels{'coordinates'} = 'Latitude/Longitude';
 
 my @fields = (
   'description',
-  { field => 'router', value => \&router },
+  { field => 'routernum', value => \&router },
   'speed_down',
   'speed_up',
   { field => 'ip_addr', value => \&ip_addr },
@@ -48,9 +48,10 @@ push @fields,
 
 sub router {
   my $svc = shift;
-  my $addr_block = $svc->addr_block or return '';
-  my $router = $addr_block->router or return '';
-  $router->routernum . ': ' . $router->routername;
+  my $router = $svc->router or return '';
+  my $block = $svc->addr_block;
+  $block = '; '.$block->cidr if $block;
+  $router->routernum . ': ' . $router->routername . $block
 }
 
 sub ip_addr {
@@ -88,14 +89,22 @@ sub coordinates {
   return '' unless $s->latitude && $s->longitude;
 
   my $d = $s->description;
+  my $agentnum;
   unless ($d) {
-    my $cust_pkg = $s->cust_svc->cust_pkg;
-    $d = $cust_pkg->cust_main->name_short if $cust_pkg;
+    if ( my $cust_pkg = $s->cust_svc->cust_pkg ) {
+      $d = $cust_pkg->cust_main->name_short;
+      $agentnum = $cust_pkg->cust_main->agentnum;
+    }
   }
   
   #'Latitude: '. $s->latitude. ', Longitude: '. $s->longitude. ' '.
   $s->latitude. ', '. $s->longitude. ' '.
-    include('/elements/coord-links.html', $s->latitude, $s->longitude, $d);
+    include('/elements/coord-links.html', 
+      $s->latitude,
+      $s->longitude,
+      $d,
+      $agentnum
+    );
 }
 
 sub svc_callback {