X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=6ca9bf0711d4132411b70ba7e1a2e025c02fb3e1;hp=3fb9156cc2811851450905b9edc281c9605bb58f;hb=25d43f8923b9d7699cab2fe6eba762e7a072cddc;hpb=497bd20a2aa6a33cff22c25232929b3d7aeaac86
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 3fb9156cc..6ca9bf071 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -45,8 +45,7 @@ function areyousure(href) {
<%= header('Account View', menubar(
( ( $pkgnum || $custnum )
- ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
- "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+ ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
)
: ( "Cancel this (unaudited) account" =>
"javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" )
@@ -57,56 +56,128 @@ function areyousure(href) {
<%
#if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
-if ( $part_svc->part_export('sqlradius') ) {
+if ( $part_svc->part_export('sqlradius')
+ || $part_svc->part_export('sqlradius_withdomain')
+) {
my $last_bill;
+ my %plandata;
if ( $cust_pkg ) {
#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 );
+ %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 $hour = int($seconds/3600);
+ my $min = int( ($seconds%3600) / 60 );
+ my $sec = $seconds%60;
- if ( $seconds ) {
- print "Online $hh $mm $ss";
+ my $input = $svc_acct->attribute_since_sqlradacct(
+ $last_bill, time, 'AcctInputOctets'
+ ) / 1048576;
+ my $output = $svc_acct->attribute_since_sqlradacct(
+ $last_bill, time, 'AcctOutputOctets'
+ ) / 1048576;
+
+%>
+
+ RADIUS session information
+ <%= ntable('#cccccc',2) %>
+