X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=14d2745a2f7b06e706ca86c985843bba4d0cf87c;hp=7295f577d5aa725ad1a7b632f981813351d45200;hb=28f7684d096f8f5c97a68d04193bc9ba1d503ef5;hpb=548a47b0ec1040320e56f17cfac71f716785cb95
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 7295f577d..14d2745a2 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,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,32 +75,32 @@ 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, 'Acct-Input-Octets'
+ $last_bill, time, 'AcctInputOctets'
) / 1048576;
my $output = $svc_acct->attribute_since_sqlradacct(
- $last_bill, time, 'Acct-Output-Octets'
+ $last_bill, time, 'AcctOutputOctets'
) / 1048576;
if ( $seconds ) {
- print "Online $hh $mm $ss";
+ print "Online $hourh $minm $secs";
} else {
print 'Has not logged on';
}
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
';
} else {
print ' (no billing cycle available for unaudited account)
';
}
- print 'Input: '. sprintf("%.3f", $input). ' megabytes
';
- print 'Output: '. sprintf("%.3f", $output). ' megabytes
';
+ print 'Input: '. sprintf("%.3f", $input). ' megabytes
';
+ print 'Output: '. sprintf("%.3f", $output). ' megabytes
';
print '
';
@@ -140,7 +141,9 @@ if ( $conf->exists('security_phrase') ) {
$svc_acct->sec_phrase. '';
}
-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 " '
if $svc_acct_pop;
@@ -170,7 +173,7 @@ if ($svc_acct->slipip) {
: $svc_acct->slipip
). "";
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 +181,7 @@ if ($svc_acct->slipip) {
"Access number ".
"". $svc_acct_pop->text. '