X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_broadband.cgi;h=263fd70f5aeb4fe1bb5c8654514f8c3ad78fd159;hp=164b5b22ce62d0a71fdd63eb17b695634f4f9a33;hb=c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9;hpb=0ebeec96313dd7edfca340f01f8fbbbac1f4aa1d

diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 164b5b22c..263fd70f5 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -20,7 +20,8 @@ if ($pkgnum) {
 }
 #eofalse
 
-my $router = $svc_broadband->addr_block->router;
+my $addr_block = $svc_broadband->addr_block;
+my $router = $addr_block->router;
 
 if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" };
 
@@ -29,63 +30,126 @@ my (
      $routernum,
      $speed_down,
      $speed_up,
-     $ip_addr
+     $ip_addr,
+     $ip_gateway,
+     $ip_netmask,
    ) = (
      $router->getfield('routername'),
      $router->getfield('routernum'),
      $svc_broadband->getfield('speed_down'),
      $svc_broadband->getfield('speed_up'),
-     $svc_broadband->getfield('ip_addr')
+     $svc_broadband->getfield('ip_addr'),
+     $addr_block->ip_gateway,
+     $addr_block->NetAddr->mask,
    );
+%>
 
-
-
-print header('Broadband Service View', menubar(
+<%=include("/elements/header.html",'Broadband Service View', menubar(
   ( ( $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
     : ( "Cancel this (unaudited) website" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
   ),
   "Main menu" => $p,
-)).
-      qq!<A HREF="${p}edit/svc_broadband.cgi?$svcnum">Edit this information</A><BR>!.
-      ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
-      qq!<TR><TD ALIGN="right">Service number</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Router</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$routernum: $routername</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Download Speed</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$speed_down</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Upload Speed</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$speed_up</TD></TR>!.
-      qq!<TR><TD ALIGN="right">IP Address</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$ip_addr</TD></TR>!.
-      '</TD></TR><TR ROWSPAN="1"><TD></TD></TR>';
+))
+%>
 
+<A HREF="<%=${p}%>edit/svc_broadband.cgi?<%=$svcnum%>">Edit this information</A>
+<BR>
+<%=ntable("#cccccc")%>
+  <TR>
+    <TD>
+      <%=ntable("#cccccc",2)%>
+        <TR>
+          <TD ALIGN="right">Service number</TD>
+          <TD BGCOLOR="#ffffff"><%=$svcnum%></TD>
+        </TR>
+        <TR>
+          <TD ALIGN="right">Router</TD>
+          <TD BGCOLOR="#ffffff"><%=$routernum%>: <%=$routername%></TD>
+        </TR>
+        <TR>
+          <TD ALIGN="right">Download Speed</TD>
+          <TD BGCOLOR="#ffffff"><%=$speed_down%></TD>
+        </TR>
+        <TR>
+          <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>
+        <TR COLSPAN="2"><TD></TD></TR>
 
-#  foreach my $sb_field 
-#      ( qsearch('sb_field', { svcnum => $svcnum }) ) {
-#    my $part_sb_field = qsearchs('part_sb_field',
-#                         { sbfieldpart => $sb_field->sbfieldpart });
-#    print q!<TR><TD ALIGN="right">! . $part_sb_field->name . 
-#          q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->value . 
-#          q!</TD></TR>!;
-#  }
-#  print '</TABLE>';
+<%
+foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) {
+  print $svc_broadband->pvf($_)->widget('HTML', 'view',
+                                        $svc_broadband->getfield($_)), "\n";
+}
 
+%>
+      </TABLE>
+    </TD>
+  </TR>
+</TABLE>
 
-  my $sb_field = $svc_broadband->sb_field_hashref;
-  foreach (sort { $a cmp $b } keys(%{$sb_field})) {
-    print q!<TR><TD ALIGN="right">! . $_ . 
-          q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->{$_} .
-          q!</TD></TR>!;
-  }
-  print '</TABLE>';
+<BR>
+<%=ntable("#cccccc", 2)%>
+<%
+  my $sb_router = qsearchs('router', { svcnum => $svcnum });
+  if ($sb_router) {
+  %>
+  <B>Router associated: <%=$sb_router->routername%> </B>
+  <A HREF="<%=popurl(2)%>edit/router.cgi?<%=$sb_router->routernum%>">
+    (details)
+  </A>
+  <BR>
+  <% my @sb_addr_block;
+     if (@sb_addr_block = $sb_router->addr_block) {
+     %>
+  <B>Address space </B>
+  <A HREF="<%=popurl(2)%>browse/addr_block.cgi">
+    (edit)
+  </A>
+  <BR>
+  <%   print ntable("#cccccc", 1);
+       foreach (@sb_addr_block) { %>
+    <TR>
+      <TD><%=$_->ip_gateway%>/<%=$_->ip_netmask%></TD>
+    </TR>
+    <% } %>
+  </TABLE>
+  <% } else { %>
+  <B>No address space allocated.</B>
+    <% } %>
+  <BR>
+  <%
+  } else {
+%>
 
+<FORM METHOD="GET" ACTION="<%=popurl(2)%>edit/router.cgi">
+  <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+Add router named 
+  <INPUT TYPE="text" NAME="routername" SIZE="32" VALUE="Broadband router (<%=$svcnum%>)">
+  <INPUT TYPE="submit" VALUE="Add router">
+</FORM>
 
-print '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
-      '</BODY></HTML>'
-;
+<%
+}
 %>
+
+<BR>
+<%=joblisting({'svcnum'=>$svcnum}, 1)%>
+  </BODY>
+</HTML>
+