X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=4e01db341682a566b844a28ed77da77a9859a396;hb=d38d8201fb8d7f18b199cf8805c17c0121dd1288;hp=30480d1e82ac62866436a77dab799307602298f2;hpb=b4206f7dd4e3f00b1fac73245ade1d28388f2ad3;p=freeside.git

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 30480d1e8..4e01db341 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -92,14 +92,14 @@ if ( $part_svc->part_export('sqlradius') ) {
   }
 
   if ( $cust_pkg ) {
-    print ' this billing cycle (since '. time2str("%C", $last_bill). ') - '. 
+    print ' since last bill ('. time2str("%C", $last_bill). ') - '. 
           $plandata{recur_included_hours}. ' total hours in plan<BR>';
   } else {
     print ' (no billing cycle available for unaudited account)<BR>';
   }
 
-  print 'Input: <B>'. sprintf("%.3f", $input). ' megabytes<BR>';
-  print 'Output: <B>'. sprintf("%.3f", $output). ' megabytes<BR>';
+  print 'Input: <B>'. sprintf("%.3f", $input). '</B> megabytes<BR>';
+  print 'Output: <B>'. sprintf("%.3f", $output). '</B> megabytes<BR>';
 
   print '<BR>';
 
@@ -140,7 +140,9 @@ if ( $conf->exists('security_phrase') ) {
         $svc_acct->sec_phrase. '</TD></TR>';
 }
 
-my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+my $svc_acct_pop = $svc_acct->popnum
+                     ? qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum})
+                     : '';
 print "<TR><TD ALIGN=\"right\">Access number</TD>".
       "<TD BGCOLOR=\"#ffffff\">". $svc_acct_pop->text. '</TD></TR>'
   if $svc_acct_pop;
@@ -170,7 +172,7 @@ if ($svc_acct->slipip) {
           : $svc_acct->slipip
         ). "</TD>";
   my($attribute);
-  foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
+  foreach $attribute ( grep /^radius_/, $svc_acct->fields ) {
     #warn $attribute;
     $attribute =~ /^radius_(.*)$/;
     my $pattribute = $FS::raddb::attrib{$1};
@@ -178,7 +180,7 @@ if ($svc_acct->slipip) {
           "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
           "</TD></TR>";
   }
-  foreach $attribute ( grep /^rc_/, fields('svc_acct') ) {
+  foreach $attribute ( grep /^rc_/, $svc_acct->fields ) {
     #warn $attribute;
     $attribute =~ /^rc_(.*)$/;
     my $pattribute = $FS::raddb::attrib{$1};
@@ -193,7 +195,19 @@ if ($svc_acct->slipip) {
 print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
       join('<BR>', $svc_acct->radius_groups). '</TD></TR>';
 
-print '</TABLE></TD></TR></TABLE><BR><BR>';
+# Can this be abstracted further?  Maybe a library function like
+# widget('HTML', 'view', $svc_acct) ?  It would definitely make UI 
+# style management easier.
+
+foreach (sort { $a cmp $b } $svc_acct->virtual_fields) {
+  print $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)),
+      "\n";
+}
+%>
+</TABLE></TD></TR></TABLE>
+<%
+
+print '<BR><BR>';
 
 print join("\n", $conf->config('svc_acct-notes') ). '<BR><BR>'.
       joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';