X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=9c2fbc94d573b29e7402f7aa72d8dbbaf8471c25;hb=c8cccb4a92adceb943c635fe62dad0d034462ce0;hp=d50241d4046a2c7a60bb361dd2a50b44f005b996;hpb=8dc221c91266dc284655942bb5de6392beecbbb3;p=freeside.git
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index d50241d40..9c2fbc94d 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,187 +1,341 @@
-
-<%
-
-my $conf = new FS::Conf;
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_acct;
-
-#false laziness w/all svc_*.cgi
-my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
- $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
- $custnum = $cust_pkg->custnum;
-} else {
- $cust_pkg = '';
- $custnum = '';
-}
-#eofalse
-
-my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unknown svcpart" unless $part_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;
-}
+%
+%
+%my $conf = new FS::Conf;
+%
+%my($query) = $cgi->keywords;
+%$query =~ /^(\d+)$/;
+%my $svcnum = $1;
+%my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+%die "Unknown svcnum" unless $svc_acct;
+%
+%#false laziness w/all svc_*.cgi
+%my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
+%my $pkgnum = $cust_svc->getfield('pkgnum');
+%my($cust_pkg, $custnum);
+%if ($pkgnum) {
+% $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+% $custnum = $cust_pkg->custnum;
+%} else {
+% $cust_pkg = '';
+% $custnum = '';
+%}
+%#eofalse
+%
+%my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+%die "Unknown svcpart" unless $part_svc;
+%my $svc = $part_svc->svc;
+%
+%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,
-)) %>
-
-<%
-
-#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 = '';
+ <% include("/elements/header.html","View $svc account", menubar(
+ "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+ "Main menu" => $p,
+ )) %>
-if ( $conf->exists('security_phrase') ) {
- my $sec_phrase = $svc_acct->sec_phrase;
- print 'Security phrase | '.
- $svc_acct->sec_phrase. ' |
';
-}
+ <% include( '/elements/small_custview.html', $custnum, '', 1 ) %>
+
+% } else {
-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).
- " |
";
+
+
+ <% include("/elements/header.html",'Account View', menubar(
+ "Cancel this (unaudited) account" =>
+ "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
+ "Main menu" => $p,
+ )) %>
+% }
+% 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 = ();
+% }
+%
+% 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;
+%
+%
-print 'RADIUS groups | '.
- join(' ', $svc_acct->radius_groups). ' |
';
-print '
';
+ RADIUS session information
+ <% ntable('#cccccc',2) %>
+
+% if ( $seconds ) {
-#if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
-if ( $part_svc->part_export('sqlradius') ) {
+ Online <% $hour %>h <% $min %>m <% $sec %>s
+% } else {
- my $last_bill;
- if ( $cust_pkg ) {
- #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
- #belong in plan data
- my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
- split("\n", $cust_pkg->part_pkg->plandata );
+ Has not logged on
+% }
+% if ( $cust_pkg ) {
- $last_bill = $cust_pkg->last_bill;
- } else {
- $last_bill = 0;
- }
+ since last bill (<% time2str('%a %b %o %Y', $last_bill) %>)
+% if ( length($plandata{recur_included_hours}) ) {
- 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;
+ - <% $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
+
+ |
+% }
- if ( $seconds ) {
- print "Online ${h}h ${m}m ${s}s";
- } else {
- print 'Has not logged on';
- }
- if ( $cust_pkg ) {
- print ' this billing cycle (since '. time2str(%C, $last_bill). ') - '.
- $plandata{recur_included_hours}. ' total hours in plan
';
+
+
+
+
+<% join("
", $conf->config('svc_acct-notes') ) %>
+
-print join("\n", $conf->config('svc_acct-notes') ). '
'.
- joblisting({'svcnum'=>$svcnum}, 1). '