YA pg7.3 fix

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

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index a6db7a4..a5cf027 100755 (executable)
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,4 +1,4 @@
-<!-- mason kludge -->
+<-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
@@ -83,6 +83,13 @@ if ( $part_svc->part_export('sqlradius') ) {
   my $m = int( ($seconds%3600) / 60 );
   my $s = $seconds%60;
 
+  my $input = $svc_acct->attribute_since_sqlradacct(
+    $last_bill, time, 'AcctInputOctets'
+  ) / 1048576;
+  my $output = $svc_acct->attribute_since_sqlradacct(
+    $last_bill, time, 'AcctOutputOctets'
+  ) / 1048576;
+
   if ( $seconds ) {
     print "Online <B>$h</B>h <B>$m</B>m <B>$s</B>s";
   } else {
@@ -90,12 +97,17 @@ if ( $part_svc->part_export('sqlradius') ) {
   }
 
   if ( $cust_pkg ) {
-    print ' this billing cycle (since '. time2str("%C", $last_bill). ') - '. 
-          $plandata{recur_included_hours}. ' total hours in plan<BR><BR>';
+    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><BR>';
+    print ' (no billing cycle available for unaudited account)<BR>';
   }
 
+  print 'Input: <B>'. sprintf("%.3f", $input). '</B> megabytes<BR>';
+  print 'Output: <B>'. sprintf("%.3f", $output). '</B> megabytes<BR>';
+
+  print '<BR>';
+
 }
 
 #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
@@ -133,7 +145,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;