X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_broadband.cgi;h=dead70b7f734832037d1a0be4de7c291538c2192;hp=145d341883e0026f57448f3bf0502032e8f2aa53;hb=c4b71bc4459cb7d403cbebede470aeb2c6292a6e;hpb=ff873782e78715891b9d5d2eb5b38c735d372556

diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 145d34188..dead70b7f 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -8,7 +8,9 @@
 ))
 %>
 
-<A HREF="<%${p}%>edit/svc_broadband.cgi?<%$svcnum%>">Edit this information</A>
+<% include('/elements/init_overlib.html') %>
+
+<% include('/view/elements/svc_edit_link.html', 'svc'=>$svc_broadband) %>
 <BR>
 <%ntable("#cccccc")%>
   <TR>
@@ -22,10 +24,14 @@
           <TD ALIGN="right">Description</TD>
           <TD BGCOLOR="#ffffff"><%$description%></TD>
         </TR>
-        <TR>
-          <TD ALIGN="right">Router</TD>
-          <TD BGCOLOR="#ffffff"><%$routernum%>: <%$routername%></TD>
-        </TR>
+
+%       if ( $router ) {
+          <TR>
+            <TD ALIGN="right">Router</TD>
+            <TD BGCOLOR="#ffffff"><%$router->routernum%>: <%$router->routername%></TD>
+          </TR>
+%       }
+
         <TR>
           <TD ALIGN="right">Download Speed</TD>
           <TD BGCOLOR="#ffffff"><%$speed_down%></TD>
@@ -34,18 +40,25 @@
           <TD ALIGN="right">Upload Speed</TD>
           <TD BGCOLOR="#ffffff"><%$speed_up%></TD>
         </TR>
-        <TR>
-          <TD ALIGN="right">IP Address</TD>
-          <TD BGCOLOR="#ffffff"><%$ip_addr%></TD>
-        </TR>
-        <TR>
-          <TD ALIGN="right">IP Netmask</TD>
-          <TD BGCOLOR="#ffffff"><%$ip_netmask%></TD>
-        </TR>
-        <TR>
-          <TD ALIGN="right">IP Gateway</TD>
-          <TD BGCOLOR="#ffffff"><%$ip_gateway%></TD>
-        </TR>
+
+%       if ( $ip_addr ) { 
+          <TR>
+            <TD ALIGN="right">IP Address</TD>
+            <TD BGCOLOR="#ffffff">
+              <%$ip_addr%>
+              (<% include('/elements/popup_link-ping.html', 'ip'=>$ip_addr ) %>)
+            </TD>
+          </TR>
+          <TR>
+            <TD ALIGN="right">IP Netmask</TD>
+            <TD BGCOLOR="#ffffff"><%$addr_block->NetAddr->mask%></TD>
+          </TR>
+          <TR>
+            <TD ALIGN="right">IP Gateway</TD>
+            <TD BGCOLOR="#ffffff"><%$addr_block->ip_gateway%></TD>
+          </TR>
+%       }
+
         <TR>
           <TD ALIGN="right">MAC Address</TD>
           <TD BGCOLOR="#ffffff"><%$mac_addr%></TD>
@@ -70,6 +83,10 @@
           <TD ALIGN="right">Authentication Key</TD>
           <TD BGCOLOR="#ffffff"><%$auth_key%></TD>
         </TR>
+	<TR>
+          <TD ALIGN="right">Service Plan Id</TD>
+          <TD BGCOLOR="#ffffff"><%$plan_id%></TD>
+        </TR>
         <TR COLSPAN="2"><TD></TD></TR>
 %
 %foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) {
@@ -155,7 +172,9 @@ my $svc_broadband = qsearchs({
                  ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
                  ' LEFT JOIN cust_main USING ( custnum ) ',
   'hashref'   => { 'svcnum' => $svcnum },
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+                            'null_right' => 'View/link unlinked services'
+                          ),
 }) or die "svc_broadband: Unknown svcnum $svcnum";
 
 #false laziness w/all svc_*.cgi
@@ -173,18 +192,14 @@ if ($pkgnum) {
 #eofalse
 
 my $addr_block = $svc_broadband->addr_block;
-my $router = $addr_block->router;
+my $router = $addr_block->router if $addr_block;
 
-if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" };
+#if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" };
 
 my (
-     $routername,
-     $routernum,
      $speed_down,
      $speed_up,
      $ip_addr,
-     $ip_gateway,
-     $ip_netmask,
      $mac_addr,
      $latitude,
      $longitude,
@@ -192,14 +207,11 @@ my (
      $vlan_profile,
      $auth_key,
      $description,
+     $plan_id,
    ) = (
-     $router->getfield('routername'),
-     $router->getfield('routernum'),
      $svc_broadband->getfield('speed_down'),
      $svc_broadband->getfield('speed_up'),
      $svc_broadband->getfield('ip_addr'),
-     $addr_block->ip_gateway,
-     $addr_block->NetAddr->mask,
      $svc_broadband->mac_addr,
      $svc_broadband->latitude,
      $svc_broadband->longitude,
@@ -207,6 +219,7 @@ my (
      $svc_broadband->vlan_profile,
      $svc_broadband->auth_key,
      $svc_broadband->description,
+     $svc_broadband->plan_id,
    );
 
 </%init>