X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=6ca9bf0711d4132411b70ba7e1a2e025c02fb3e1;hp=e755f87d7f8896e5047d542a0f33357dd16b6c64;hb=25d43f8923b9d7699cab2fe6eba762e7a072cddc;hpb=05030dc1852f7886f3b792b5a5fe469dcaa36199;ds=sidebyside
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index e755f87d7..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\')" )
@@ -56,22 +55,129 @@ function areyousure(href) {
<%
-#print qq!
Send account information!;
+#if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
+if ( $part_svc->part_export('sqlradius')
+ || $part_svc->part_export('sqlradius_withdomain')
+) {
-print qq!Edit this information
!.
- &ntable("#cccccc"). '
'. &ntable("#cccccc",2).
- " |
Service number | ".
- "$svcnum |
".
- "Service | ".
- "". $part_svc->svc. " |
".
- "Username | ".
- "". $svc_acct->username. " |
"
-;
+ 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 $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'
+ ) / 1048576;
+ my $output = $svc_acct->attribute_since_sqlradacct(
+ $last_bill, time, 'AcctOutputOctets'
+ ) / 1048576;
+
+%>
+
+ RADIUS session information
+ <%= ntable('#cccccc',2) %>
+
+
+ <% if ( $seconds ) { %>
+ Online <%= $hour %>h <%= $min %>m <%= $sec %>s
+ <% } else { %>
+ Has not logged on
+ <% } %>
-print " |
Domain | ".
- "". $domain, " |
";
+ <% if ( $cust_pkg ) { %>
+ since last bill (<%= time2str('%a %b %o %Y', $last_bill) %>)
+ <% if ( length($plandata{recur_included_hours}) ) { %>
+ - <%= $plandata{recur_included_hours} %> total hours in plan
+ <% } %>
+
+ <% } else { %>
+ (no billing cycle available for unaudited account)
+ <% } %>
+
+ Upload: <%= sprintf("%.3f", $input) %> megabytes
+ Download: <%= sprintf("%.3f", $output) %> megabytes
+
+ <% my $href = qq!this billing cycle
+ | <%= $href %>;begin=<%= time-15552000 %>">past six months
+ | <%= $href %>">all sessions
+
+
+
+<% } %>
+
+
+
+<%
+
+print '
';
-print join("\n", $conf->config('svc_acct-notes') ). '
'.
+print join("\n", $conf->config('svc_acct-notes') ). '
'.
joblisting({'svcnum'=>$svcnum}, 1). '