X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=c378094d93c8421a29815a99aaee77bcf7b761a4;hb=85c41e331693556068a72ab85b0229ba11d0492b;hp=6ca9bf0711d4132411b70ba7e1a2e025c02fb3e1;hpb=f7fd2a3e34da751cbc02bbf215e99c6dc89adc15;p=freeside.git
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 6ca9bf071..c378094d9 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,125 +1,94 @@
-
-<%
+% if ( $custnum ) {
-my $conf = new FS::Conf;
+ <% include("/elements/header.html","View $svc account") %>
+ <% include( '/elements/small_custview.html', $custnum, '', 1,
+ "${p}view/cust_main.cgi") %>
+
-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
+% } else {
-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;
-}
-
-%>
-
-
-
-<%= header('Account View', menubar(
- ( ( $pkgnum || $custnum )
- ? ( "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,
-)) %>
-
-<%
-
-#if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
-if ( $part_svc->part_export('sqlradius')
- || $part_svc->part_export('sqlradius_withdomain')
-) {
-
- 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 = ();
+
+
+ <% include("/elements/header.html",'Account View', menubar(
+ "Cancel this (unaudited) account" =>
+ "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
+ )) %>
+
+% }
+
+% 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;
+%
+%
- 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) %>
+ <% ntable('#cccccc',2) %>
+% if ( $seconds ) {
+
+ Online <% $hour %>h <% $min %>m <% $sec %>s
+% } else {
- <% 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
+% }
- <% 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 { %>
+% } else {
+
(no billing cycle available for unaudited account)
- <% } %>
+% }
- Upload: <%= sprintf("%.3f", $input) %> megabytes
- Download: <%= sprintf("%.3f", $output) %> megabytes
- <% my $href = qq! megabytes
+ Download: <% sprintf("%.3f", $output) %> megabytes
+% my $href = qq!this billing cycle
- | <%= $href %>;begin=<%= time-15552000 %>">past six months
- | <%= $href %>">all sessions
+ <% $href %>;begin=<% $last_bill %>">this billing cycle
+ | <% $href %>;begin=<% time-15552000 %>">past six months
+ | <% $href %>">all sessions
|
+% }
-<% } %>
-
+
+
+<% join("
", $conf->config('svc_acct-notes') ) %>
+
+
+<% joblisting({'svcnum'=>$svcnum}, 1) %>
+
+<% include('/elements/footer.html') %>
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('View customer services')
+ || $FS::CurrentUser::CurrentUser->access_right('View customer'); #XXX remove me
-if ( $conf->exists('security_phrase') ) {
- my $sec_phrase = $svc_acct->sec_phrase;
- print 'Security phrase | '.
- $svc_acct->sec_phrase. ' |
';
-}
+my $conf = new FS::Conf;
-my $svc_acct_pop = $svc_acct->popnum
- ? 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) |
";
-}
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+my $svcnum = $1;
+my $svc_acct = qsearchs({
+ 'select' => 'svc_acct.*',
+ 'table' => 'svc_acct',
+ 'addl_from' => ' LEFT JOIN cust_svc USING ( svcnum ) '.
+ ' LEFT JOIN cust_pkg USING ( pkgnum ) '.
+ ' LEFT JOIN cust_main USING ( custnum ) ',
+ 'hashref' => {'svcnum'=>$svcnum},
+ 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+});
+die "Unknown svcnum" unless $svc_acct;
-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_/, $svc_acct->fields ) {
- #warn $attribute;
- $attribute =~ /^radius_(.*)$/;
- my $pattribute = $FS::raddb::attrib{$1};
- print "
Radius (reply) $pattribute | ".
- "". $svc_acct->getfield($attribute).
- " |
";
- }
- foreach $attribute ( grep /^rc_/, $svc_acct->fields ) {
- #warn $attribute;
- $attribute =~ /^rc_(.*)$/;
- my $pattribute = $FS::raddb::attrib{$1};
- print "Radius (check) $pattribute: | ".
- "". $svc_acct->getfield($attribute).
- " |
";
- }
+#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 {
- print "(No SLIP/PPP account) |
";
-}
-
-print 'RADIUS groups | '.
- join(' ', $svc_acct->radius_groups). ' |
';
-
-# Can this be abstracted further? Maybe a library function like
-# widget('HTML', 'view', $svc_acct) ? It would definitely make UI
-# style management easier.
-
-foreach (sort { $a cmp $b } $svc_acct->virtual_fields) {
- print $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)),
- "\n";
+ $cust_pkg = '';
+ $custnum = '';
}
-%>
-
-<%
+#eofalse
-print '
';
+my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+die "Unknown svcpart" unless $part_svc;
+my $svc = $part_svc->svc;
-print join("\n", $conf->config('svc_acct-notes') ). '
'.
- joblisting({'svcnum'=>$svcnum}, 1). '