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

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index e755f87d7..30480d1e8 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -56,6 +56,55 @@ function areyousure(href) {
 
 <%
 
+#if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
+if ( $part_svc->part_export('sqlradius') ) {
+
+  my $last_bill;
+  my %plandata;
+  if ( $cust_pkg ) {
+    #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
+    #belong in plan data
+    %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+                    split("\n", $cust_pkg->part_pkg->plandata );
+
+    $last_bill = $cust_pkg->last_bill;
+  } else {
+    $last_bill = 0;
+    %plandata = ();
+  }
+
+  my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time );
+  my $h = int($seconds/3600);
+  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 {
+    print 'Has not logged on';
+  }
+
+  if ( $cust_pkg ) {
+    print ' this billing cycle (since '. 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 '<BR>';
+
+}
+
 #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
 
 print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A><BR>!.
@@ -146,36 +195,7 @@ print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
 
 print '</TABLE></TD></TR></TABLE><BR><BR>';
 
-if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
-
-  #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
-  #belong in plan data
-  my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-                    split("\n", $cust_pkg->part_pkg->plandata );
-
-  my $last_bill = $cust_pkg->last_bill;
-  my $seconds = $svc_acct->seconds_since_sqlradacct(
-    $last_bill,
-    time,
-    $plandata{sql_datasrc},
-    $plandata{sql_username},
-    $plandata{sql_password},
-  );
-  my $h = int($seconds/3600);
-  my $m = int( ($seconds%3600) / 60 );
-  my $s = $seconds%60;
-  if ( $seconds ) {
-    print 'Online $h h $m m $s s this billing cycle (since '.
-          time2str(%C, $last_bill). ') - '. 
-          $plandata{recur_included_hours}. ' total hours in plan<BR><BR>';
-  } else {
-    print 'Has not logged on this billing cycle (since '.
-          time2str(%C, $last_bill). ')<BR><BR>';
-  }
-
-}
-
-print join("\n", $conf->config('svc_acct-notes') ).  '<BR><BR>'.
+print join("\n", $conf->config('svc_acct-notes') ). '<BR><BR>'.
       joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
 
 %>