X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=246a7fbc86e402e454234088136b62835d4e57a4;hb=ca1b5151cb9093fcb49de2ffd885754e1a5d5d48;hp=58591fcb568cec9578f5025865562a07a4c1966d;hpb=eb9668a6f3181ee02cb335272c5ee4616e61fd09;p=freeside.git diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index 58591fcb5..246a7fbc8 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -45,8 +45,7 @@ function areyousure(href) { <%= 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", + ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum", ) : ( "Cancel this (unaudited) account" => "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" ) @@ -87,42 +86,98 @@ if ( $part_svc->part_export('sqlradius') $last_bill, time, 'AcctOutputOctets' ) / 1048576; - if ( $seconds ) { - print "Online $hourh $minm $secs"; - } else { - print 'Has not logged on'; - } +%> - if ( $cust_pkg ) { - print ' since last bill ('. time2str("%C", $last_bill). ') - '. - $plandata{recur_included_hours}. ' total hours in plan
'; + 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
+ + <% my $href = qq!this billing cycle + | <%= $href %>;begin=<%= time-15552000 %>">past six months + | <%= $href %>">all sessions + +
+ +<% } %> + + +
+ + + +<% #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 { + @part_svc = qsearch('part_svc', { + svcdb => 'svc_acct', + disabled => '', + svcpart => { op=>'!=', value=>$part_svc->svcpart }, + } ); + } +%> -#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, ""; +Service Information +| Edit this information + +<% if ( @part_svc ) { %> +| + +<% } %> + +<%= &ntable("#cccccc") %><%= &ntable("#cccccc",2) %> +Service number + <%= $svcnum %> +Service + <%= $part_svc->svc %> +Username + <%= $svc_acct->username %> +Domain + <%= $domain %> + +Password + <% -print "Password"; my $password = $svc_acct->_password; if ( $password =~ /^\*\w+\* (.*)$/ ) { $password = $1; @@ -149,49 +204,80 @@ 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_/, $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). - ""; - } -} else { - print "(No SLIP/PPP account)"; +<% 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 + %> + + +<% } %> + +<% + +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). + ""; } print 'RADIUS groups'. @@ -206,7 +292,7 @@ foreach (sort { $a cmp $b } $svc_acct->virtual_fields) { "\n"; } %> - +
<% print '

';