X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=6ca9bf0711d4132411b70ba7e1a2e025c02fb3e1;hb=6a953c149c5f4423cafc510e34c60b41bd7d0ef9;hp=f04e471635f119e1f82a3ea62220381cd9a3ef5c;hpb=2e9ff8b770519382f5767faf7a1dd15eb79eb7fe;p=freeside.git
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index f04e47163..6ca9bf071 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,4 +1,4 @@
-<-- mason kludge -->
+
<%
my $conf = new FS::Conf;
@@ -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,7 +56,9 @@ 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;
@@ -74,9 +75,9 @@ if ( $part_svc->part_export('sqlradius') ) {
}
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;
my $input = $svc_acct->attribute_since_sqlradacct(
$last_bill, time, 'AcctInputOctets'
@@ -85,42 +86,98 @@ if ( $part_svc->part_export('sqlradius') ) {
$last_bill, time, 'AcctOutputOctets'
) / 1048576;
- if ( $seconds ) {
- print "Online $hh $mm $ss";
- } else {
- print 'Has not logged on';
- }
+%>
- if ( $cust_pkg ) {
- print ' since last bill ('. time2str("%C", $last_bill). ') - '.
- $plandata{recur_included_hours}. ' total hours in plan
';
+ RADIUS session information
+ <%= ntable('#cccccc',2) %>
+