X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=f4f39084c634f330a70034bd42ff170b1f045b89;hb=b8ec621c59747a1c2fcd7fbd603d0c6de41e7df5;hp=f2228424c8a62aa66a01c783d3b77c4d966970eb;hpb=69f92e8567d1952bc4cbf29d944b97051467bd11;p=freeside.git
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index f2228424c..f4f39084c 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,4 +1,3 @@
-
<%
my $conf = new FS::Conf;
@@ -24,128 +23,310 @@ if ($pkgnum) {
my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
die "Unknown svcpart" unless $part_svc;
+my $svc = $part_svc->svc;
-my $domain;
-if ( $svc_acct->domsvc ) {
- my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
- die "Unknown domain" unless $svc_domain;
- $domain = $svc_domain->domain;
-} else {
- die "No svc_domain.svcnum record for svc_acct.domsvc: ". $cust_svc->domsvc;
-}
+die 'Empty domsvc for svc_acct.svcnum '. $svc_acct->svcnum
+ unless $svc_acct->domsvc;
+my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+die 'Unknown domain (domsvc '. $svc_acct->domsvc.
+ ' for svc_acct.svcnum '. $svc_acct->svcnum. ')'
+ unless $svc_domain;
+my $domain = $svc_domain->domain;
%>
-
+<% if ( $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",
- )
- : ( "Cancel this (unaudited) account" =>
- "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" )
- ),
- "Main menu" => $p,
-)) %>
+ <%= include("/elements/header.html","View $svc account", menubar(
+ "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+ "Main menu" => $p,
+ )) %>
-<%
+ <%= include( '/elements/small_custview.html', $custnum, '', 1 ) %>
+
-#print qq!
Send account information!;
-
-print qq!Edit this information
!.
- &ntable("#cccccc"). '
'. &ntable("#cccccc",2).
- " |
Service number | ".
- "$svcnum |
".
- "Service | ".
- "". $part_svc->svc. " |
".
- "Username | ".
- "". $svc_acct->username. " |
"
-;
-
-print "Domain | ".
- "". $domain, " |
";
-
-print "Password | ";
-my $password = $svc_acct->_password;
-if ( $password =~ /^\*\w+\* (.*)$/ ) {
- $password = $1;
- print "(login disabled) ";
-}
-if ( $conf->exists('showpasswords') ) {
- print ''. encode_entities($password). ' ';
-} else {
- print "(hidden)";
-}
-print " |
";
-$password = '';
+<% } else { %>
-if ( $conf->exists('security_phrase') ) {
- my $sec_phrase = $svc_acct->sec_phrase;
- print 'Security phrase | '.
- $svc_acct->sec_phrase. ' |
';
-}
+
+
+ <%= include("/elements/header.html",'Account View', menubar(
+ "Cancel this (unaudited) account" =>
+ "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
+ "Main menu" => $p,
+ )) %>
-my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
-print "Access number | ".
- "". $svc_acct_pop->text. ' |
'
- if $svc_acct_pop;
-
-if ($svc_acct->uid ne '') {
- print "Uid | ".
- "". $svc_acct->uid. " |
",
- "Gid | ".
- "". $svc_acct->gid. " |
",
- "GECOS | ".
- "". $svc_acct->finger. " |
",
- "Home directory | ".
- "". $svc_acct->dir. " |
",
- "Shell | ".
- "". $svc_acct->shell. " |
",
- "Quota | ".
- "". $svc_acct->quota. " |
"
- ;
-} else {
- print "(No shell account) |
";
-}
+<% } %>
-if ($svc_acct->slipip) {
- print "IP address | ".
- ( ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
- ? "(Dynamic)"
- : $svc_acct->slipip
- ). " | ";
- my($attribute);
- foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
- #warn $attribute;
- $attribute =~ /^radius_(.*)$/;
- my $pattribute = $FS::raddb::attrib{$1};
- print "
Radius (reply) $pattribute | ".
- "". $svc_acct->getfield($attribute).
- " |
";
+<% if ( $part_svc->part_export_usage ) {
+
+ 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 = ();
}
- foreach $attribute ( grep /^rc_/, fields('svc_acct') ) {
- #warn $attribute;
- $attribute =~ /^rc_(.*)$/;
- my $pattribute = $FS::raddb::attrib{$1};
- print "Radius (check) $pattribute: | ".
- "". $svc_acct->getfield($attribute).
- " |
";
+
+ 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
+ <% } %>
+
+ <% 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
+
+ |
+
+<% } %>
+
+
+