Virtual field merge

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

diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 156edfa..677a4b0 100644 (file)
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -20,28 +20,26 @@ if ($pkgnum) {
 }
 #eofalse
 
-my $ac = qsearchs('ac', { acnum => $svc_broadband->getfield('acnum') });
+my $router = $svc_broadband->addr_block->router;
+
+if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" };
 
 my (
-     $acname,
-     $acnum,
+     $routername,
+     $routernum,
      $speed_down,
      $speed_up,
-     $ip_addr,
-     $ip_netmask,
-     $mac_addr,
-     $location
+     $ip_addr
    ) = (
-     $ac->getfield('acname'),
-     $ac->getfield('acnum'),
+     $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_netmask'),
-     $svc_broadband->getfield('mac_addr'),
-     $svc_broadband->getfield('location')
+     $svc_broadband->getfield('ip_addr')
    );
 
+
+
 print header('Broadband Service View', menubar(
   ( ( $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
@@ -56,20 +54,24 @@ print header('Broadband Service View', menubar(
       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">AC</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$acnum: $acname</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/Mask</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$ip_addr/$ip_netmask</TD></TR>!.
-      qq!<TR><TD ALIGN="right">MAC Address</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$mac_addr</TD></TR>!.
-      qq!<TR><TD ALIGN="right" VALIGN="TOP">Location</TD>!.
-        qq!<TD BGCOLOR="#ffffff"><PRE>$location</PRE></TD></TR>!.
-      '</TABLE></TD></TR></TABLE>'.
-      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+      qq!<TR><TD ALIGN="right">IP Address</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$ip_addr</TD></TR>!.
+      '</TD></TR><TR ROWSPAN="1"><TD></TD></TR>';
+
+foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) {
+  print $svc_broadband->pvf($_)->widget('HTML', 'view', 
+      $svc_broadband->getfield($_)), "\n";
+}
+
+print '</TABLE>';
+
+print '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;
 %>