X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=7257fc3e497db56b9fa0347eda6e3bba623f44e2;hb=a5bbbed61e09dffffc5d7022cddb3f9ff62a955a;hp=3fb9156cc2811851450905b9edc281c9605bb58f;hpb=497bd20a2aa6a33cff22c25232929b3d7aeaac86;p=freeside.git diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index 3fb9156cc..7257fc3e4 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -1,4 +1,3 @@ - <% my $conf = new FS::Conf; @@ -24,164 +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, -)) %> + <%= header("View $svc account", menubar( + "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum", + "Main menu" => $p, + )) %> -<% + <%= include( '/elements/small_custview.html', $custnum, '', 1 ) %> +
+ +<% } else { %> + + + + <%= header('Account View', menubar( + "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') ) { +<% } %> + +<% 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 - my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); } - split("\n", $cust_pkg->part_pkg->plandata ); + %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 $h = int($seconds/3600); - my $m = int( ($seconds%3600) / 60 ); - my $s = $seconds%60; + 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)
+ <% } %> - if ( $seconds ) { - print "Online $hh $mm $ss"; + 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 ( $cust_pkg ) { - print ' this billing cycle (since '. time2str(%C, $last_bill). ') - '. - $plandata{recur_included_hours}. ' total hours in plan

'; +<% #print qq!
Send account information!; %> + +<% + my @part_svc = (); + if ( $pkgnum ) { + @part_svc = grep { $_->svcdb eq 'svc_acct' + && $_->svcpart != $part_svc->svcpart } + $cust_pkg->available_part_svc; } else { - print ' (no billing cycle available for unaudited account)

'; + @part_svc = qsearch('part_svc', { + svcdb => 'svc_acct', + disabled => '', + svcpart => { op=>'!=', value=>$part_svc->svcpart }, + } ); } +%> -} +Service #<%= $svcnum %> +| Edit this service -#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 ( @part_svc ) { %> +| + +<% } %> -if ( $conf->exists('security_phrase') ) { - my $sec_phrase = $svc_acct->sec_phrase; - print 'Security phrase'. - $svc_acct->sec_phrase. ''; -} +<%= &ntable("#cccccc") %><%= &ntable("#cccccc",2) %> -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)"; -} + + Service + <%= $part_svc->svc %> + + + Username + <%= $svc_acct->username %> + + + Domain + <%= $domain %> + -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)"; -} + + Password + -print 'RADIUS groups'. - join('
', $svc_acct->radius_groups). ''; + <% my $password = $svc_acct->_password; %> + <% if ( $password =~ /^\*\w+\* (.*)$/ ) { + $password = $1; + %> + (login disabled) + <% } %> -print '

'; + <% if ( $conf->exists('showpasswords') ) { %> + 
<%= encode_entities($password) %>
+ <% } else { %> + (hidden) + <% } %> -print join("\n", $conf->config('svc_acct-notes') ). '

'. - joblisting({'svcnum'=>$svcnum}, 1). ''; + + +<% $password = ''; %> + +<% if ( $conf->exists('security_phrase') ) { + my $sec_phrase = $svc_acct->sec_phrase; +%> + + Security phrase + <%= $svc_acct->sec_phrase %> + +<% } %> +<% if ( $svc_acct->popnum ) { + my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum}); %> + + Access number + <%= $svc_acct_pop->text %> + +<% } %> + +<% if ($svc_acct->uid ne '') { %> + + UID + <%= $svc_acct->uid %> + +<% } %> + +<% if ($svc_acct->gid ne '') { %> + + GID + <%= $svc_acct->gid %> + +<% } %> + +<% if ($svc_acct->finger ne '') { %> + + GECOS + <%= $svc_acct->finger %> + +<% } %> + +<% if ($svc_acct->dir ne '') { %> + + Home directory + <%= $svc_acct->dir %> + +<% } %> + +<% if ($svc_acct->shell ne '') { %> + + Shell + <%= $svc_acct->shell %> + +<% } %> + +<% if ($svc_acct->quota ne '') { %> + + Quota + <%= $svc_acct->quota %> + +<% } %> + +<% if ($svc_acct->slipip) { %> + + IP address + + <%= ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) + ? "(Dynamic)" + : $svc_acct->slipip + %> + + +<% } %> + +<% foreach my $attribute ( grep /^radius_/, $svc_acct->fields ) { + $attribute =~ /^radius_(.*)$/; + my $pattribute = $FS::raddb::attrib{$1}; +%> + + Radius (reply) <%= $pattribute %> + <%= $svc_acct->getfield($attribute) %> + +<% } %> + +<% foreach my $attribute ( grep /^rc_/, $svc_acct->fields ) { + $attribute =~ /^rc_(.*)$/; + my $pattribute = $FS::raddb::attrib{$1}; +%> + + Radius (check) <%= $pattribute %> + <%= $svc_acct->getfield($attribute) %> + +<% } %> + + + RADIUS groups + <%= join('
', $svc_acct->radius_groups) %> + + +<% if ( $svc_acct->seconds =~ /^\d+$/ ) { %> + + Prepaid time + <%= duration_exact($svc_acct->seconds) %> + +<% } %> + +<% +# 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) { %> + <%= $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)) %> +<% } %> + + +
+

+ +<%= join("
", $conf->config('svc_acct-notes') ) %> +

+ +<%= joblisting({'svcnum'=>$svcnum}, 1) %> + + +