X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_broadband.cgi;h=22cbb1f44f0705af4faf210f5f597766b83b14d4;hp=ae23386a18b56525c99f35ee307bf3f624b36122;hb=573139dbd6c37808697bfa72a3a468bb0980d4dd;hpb=e3f327b2af9e6a591bae41d315fda731ec7f5128

diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index ae23386a1..22cbb1f44 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -1,142 +1,75 @@
-<!-- mason kludge -->
-<%
+<& elements/svc_Common.html,
+  table   => 'svc_broadband',
+  labels  => \%labels,
+  fields  => \@fields,
+&>
+<%init>
 
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_broadband = qsearchs( 'svc_broadband', { 'svcnum' => $svcnum } )
-  or die "svc_broadband: Unknown svcnum $svcnum";
+my $conf = FS::Conf->new;
+my $fields = FS::svc_broadband->table_info->{'fields'};
+my %labels = map { $_ => ( ref($fields->{$_}) 
+                            ? $fields->{$_}{'label'} 
+                            : $fields->{$_}
+                          );
+                 } keys %$fields;
 
-#false laziness w/all svc_*.cgi
-my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
-  $custnum = $cust_pkg->custnum;
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-#eofalse
-
-my $router = $svc_broadband->addr_block->router;
-
-if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" };
-
-my (
-     $routername,
-     $routernum,
-     $speed_down,
-     $speed_up,
-     $ip_addr
-   ) = (
-     $router->getfield('routername'),
-     $router->getfield('routernum'),
-     $svc_broadband->getfield('speed_down'),
-     $svc_broadband->getfield('speed_up'),
-     $svc_broadband->getfield('ip_addr')
-   );
-%>
+$labels{'router'} = emt('Router');
+$labels{'usergroup'} = emt('RADIUS groups'); #?
 
-<%=header('Broadband Service View', menubar(
-  ( ( $custnum )
-    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )                                                                       
-    : ( "Cancel this (unaudited) website" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-))
-%>
+my @fields = (
+  'description',
+  { field => 'router', value => \&router },
+  'speed_down',
+  'speed_up',
+  { field => 'ip_addr', value => \&ip_addr },
+  { field => 'sectornum', value => \&sectornum },
+  'mac_addr',
+  'latitude',
+  'longitude',
+  'altitude',
+  'vlan_profile',
+  'authkey',
+  'plan_id',
+);
 
-<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 COLSPAN="2"><TD></TD></TR>
+push @fields,
+  { field => 'usergroup', value => \&usergroup }
+  if $conf->exists('svc_broadband-radius');
 
-<%
-foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) {
-  print $svc_broadband->pvf($_)->widget('HTML', 'view',
-                                        $svc_broadband->getfield($_)), "\n";
+sub router {
+  my $svc = shift;
+  my $addr_block = $svc->addr_block or return '';
+  my $router = $addr_block->router or return '';
+  $router->routernum . ': ' . $router->routername;
 }
 
-%>
-      </TABLE>
-    </TD>
-  </TR>
-</TABLE>
+sub ip_addr {
+  my $svc = shift;
+  my $ip_addr = $svc->ip_addr;
+  my $out = $ip_addr . ' (' . 
+    include('/elements/popup_link-ping.html', ip => $ip_addr) . ')';
+  if ( my $addr_block = $svc->addr_block ) {
+    $out .= '<br>Netmask: ' . $addr_block->NetAddr->mask .
+            '<br>Gateway: ' . $addr_block->ip_gateway;
+  }
+  $out;
+}
 
-<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 @addr_block;
-     if (@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 (@addr_block) { %>
-    <TR>
-      <TD><%=$_->ip_gateway%>/<%=$_->ip_netmask%></TD>
-    </TR>
-    <% } %>
-  </TABLE>
-  <% } else { %>
-  <B>No address space allocated.</B>
-    <% } %>
-  <BR>
-  <%
-  } else {
-%>
+sub usergroup {
+  my $svc = shift;
+  my $usergroup = $svc->usergroup;
+  join('<BR>', $svc->radius_groups('long_description'));
+}
 
-<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>
+sub sectornum {
+  my $svc_broadband = shift;
+  return '' unless $svc_broadband->sectornum;
+  my $tower_sector = $svc_broadband->tower_sector;
+  my $link = $tower_sector->ip_addr
+               ? '<A HREF="http://'. $tower_sector->ip_addr. '">'
+               : '';
 
-<%
+  $link .  $tower_sector->description. ( $link ? '</A>' : '');
 }
-%>
-
-<BR>
-<%=joblisting({'svcnum'=>$svcnum}, 1)%>
-  </BODY>
-</HTML>
 
+</%init>