projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
catch misconfigured exports
[freeside.git]
/
httemplate
/
view
/
svc_acct.cgi
diff --git
a/httemplate/view/svc_acct.cgi
b/httemplate/view/svc_acct.cgi
index
4e01db3
..
14d2745
100755
(executable)
--- 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 )
<%= 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\')" )
)
: ( "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 ( $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;
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 $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 $h
our
= int($seconds/3600);
+ my $m
in
= int( ($seconds%3600) / 60 );
+ my $s
ec
= $seconds%60;
my $input = $svc_acct->attribute_since_sqlradacct(
$last_bill, time, 'AcctInputOctets'
my $input = $svc_acct->attribute_since_sqlradacct(
$last_bill, time, 'AcctInputOctets'
@@
-86,7
+87,7
@@
if ( $part_svc->part_export('sqlradius') ) {
) / 1048576;
if ( $seconds ) {
) / 1048576;
if ( $seconds ) {
- print "Online <B>$h
</B>h <B>$m</B>m <B>$s
</B>s";
+ print "Online <B>$h
our</B>h <B>$min</B>m <B>$sec
</B>s";
} else {
print 'Has not logged on';
}
} else {
print 'Has not logged on';
}