X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=7e94df16dc65d50ebc9e6ace122c3ab5b94dc81b;hb=d0221fabd4656b3a04251ca6168cc45f54d23574;hp=e755f87d7f8896e5047d542a0f33357dd16b6c64;hpb=05030dc1852f7886f3b792b5a5fe469dcaa36199;p=freeside.git
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index e755f87d7..7e94df16d 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,12 +1,375 @@
-
-<%
+% if ( $custnum ) {
+
+ <% include("/elements/header.html","View $svc account") %>
+ <% include( '/elements/small_custview.html', $custnum, '', 1,
+ "${p}view/cust_main.cgi") %>
+
+
+% } else {
+
+
+
+ <% 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;
+%
+%
+
+
+ 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
+ Last Login: <% $svc_acct->last_login_text %>
+% my $href = qq!this billing cycle
+ | <% $href %>;begin=<% time-15552000 %>">past six months
+ | <% $href %>">all sessions
+
+ |
+% }
+
+% my @part_svc = ();
+% if ($FS::CurrentUser::CurrentUser->access_right('Change customer service')) {
+
+
+
+
+
+
+% if ( @svc_www ) {
+ Hosting
+ <% &ntable("#cccccc") %><% &ntable("#cccccc",2) %>
+% foreach my $svc_www (@svc_www) {
+% my($label, $value) = $svc_www->cust_svc->label;
+% my $link = $p. 'view/svc_www.cgi?'. $svc_www->svcnum;
+ |
+
+ <% "$label: $value" %>
+ |
+
+% }
+
+
+% }
+
+<% 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');
my $conf = new FS::Conf;
+my $addl_from = ' LEFT JOIN cust_svc USING ( svcnum ) '.
+ ' LEFT JOIN cust_pkg USING ( pkgnum ) '.
+ ' LEFT JOIN cust_main USING ( custnum ) ';
+
my($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
my $svcnum = $1;
-my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+my $svc_acct = qsearchs({
+ 'select' => 'svc_acct.*',
+ 'table' => 'svc_acct',
+ 'addl_from' => $addl_from,
+ 'hashref' => { 'svcnum' => $svcnum },
+ 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+ 'null_right' => 'View/link unlinked services'
+ ),
+});
die "Unknown svcnum" unless $svc_acct;
#false laziness w/all svc_*.cgi
@@ -24,158 +387,27 @@ 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;
-}
-
-%>
-
-
-
-<%= 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 = '';
-
-if ( $conf->exists('security_phrase') ) {
- my $sec_phrase = $svc_acct->sec_phrase;
- print 'Security phrase | '.
- $svc_acct->sec_phrase. ' |
';
-}
-
-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).
- " |
";
- }
- 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).
- " |
";
- }
-} else {
- print "(No SLIP/PPP account) |
";
-}
-
-print 'RADIUS groups | '.
- join(' ', $svc_acct->radius_groups). ' |
';
-
-print '
';
-
-if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
-
- #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 );
-
- my $last_bill = $cust_pkg->last_bill;
- my $seconds = $svc_acct->seconds_since_sqlradacct(
- $last_bill,
- time,
- $plandata{sql_datasrc},
- $plandata{sql_username},
- $plandata{sql_password},
- );
- my $h = int($seconds/3600);
- my $m = int( ($seconds%3600) / 60 );
- my $s = $seconds%60;
- if ( $seconds ) {
- print 'Online $h h $m m $s s this billing cycle (since '.
- time2str(%C, $last_bill). ') - '.
- $plandata{recur_included_hours}. ' total hours in plan
';
- } else {
- print 'Has not logged on this billing cycle (since '.
- time2str(%C, $last_bill). ')
';
- }
-
-}
+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;
-print join("\n", $conf->config('svc_acct-notes') ). '
'.
- joblisting({'svcnum'=>$svcnum}, 1). '