X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=30480d1e82ac62866436a77dab799307602298f2;hb=b4206f7dd4e3f00b1fac73245ade1d28388f2ad3;hp=a4e377078df0fcbb435ee37a9eb765224511b03e;hpb=1fd6d8cf5d7854860ef4fd10ed89828e0c04ec39;p=freeside.git diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index a4e377078..30480d1e8 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -1,8 +1,7 @@ - + <% my $conf = new FS::Conf; -my $mydomain = $conf->config('domain'); my($query) = $cgi->keywords; $query =~ /^(\d+)$/; @@ -32,23 +31,79 @@ if ( $svc_acct->domsvc ) { die "Unknown domain" unless $svc_domain; $domain = $svc_domain->domain; } else { - unless ( $mydomain ) { - die "No legacy domain config file and no svc_domain.svcnum record ". - "for svc_acct.domsvc: ". $cust_svc->domsvc; - } - $domain = $mydomain; + die "No svc_domain.svcnum record for svc_acct.domsvc: ". $cust_svc->domsvc; } -print header('Account View', menubar( +%> + + + +<%= 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" => - "${p}misc/cancel-unaudited.cgi?$svcnum" ) + "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') ) { + + 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 $h = int($seconds/3600); + my $m = int( ($seconds%3600) / 60 ); + my $s = $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; + + if ( $seconds ) { + print "Online $hh $mm $ss"; + } 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
'; + } else { + print ' (no billing cycle available for unaudited account)
'; + } + + print 'Input: '. sprintf("%.3f", $input). ' megabytes
'; + print 'Output: '. sprintf("%.3f", $output). ' megabytes
'; + + print '
'; + +} #print qq!
Send account information!; @@ -72,13 +127,19 @@ if ( $password =~ /^\*\w+\* (.*)$/ ) { print "(login disabled) "; } if ( $conf->exists('showpasswords') ) { - print "$password"; + 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. '' @@ -129,6 +190,12 @@ if ($svc_acct->slipip) { print "(No SLIP/PPP account)"; } -print ""; +print 'RADIUS groups'. + join('
', $svc_acct->radius_groups). ''; + +print '

'; + +print join("\n", $conf->config('svc_acct-notes') ). '

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