X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fsvc_acct.cgi;h=9135e67e956727bb805d173c3bfda60c72622d03;hb=9bdca2fe23584918219395b62effbb9ef0fc5f1c;hp=86478681c8e4f6c716198d7cfdca8688270c5e1b;hpb=17856ff5c299e4db21da28116f2666655c03f2c7;p=freeside.git diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index 86478681c..9135e67e9 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -14,302 +14,63 @@ } - <% include("/elements/header.html",'Account View', menubar( + <% include("/elements/header.html",'View account', 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
-% 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 }, -% } ); -% } -% +<% include( 'svc_acct/radius_usage.html', + 'svc_acct' => $svc_acct, + 'part_svc' => $part_svc, + 'cust_pkg' => $cust_pkg, + %gopt, + ) +%> +<% include( 'svc_acct/change_svc_form.html', + 'part_svc' => \@part_svc, + 'svcnum' => $svcnum, + 'pkgnum' => $pkgnum, + %gopt, + ) +%> Service #<% $svcnum %> | Edit this service -% if ( @part_svc ) { - -| - -% } - - -<% &ntable("#cccccc") %><% &ntable("#cccccc",2) %> - - - Service - <% $part_svc->svc %> - - - Username - <% $svc_acct->username %> - - - Domain - <% $domain %> - - - - Password - -% my $password = $svc_acct->_password; -% if ( $password =~ /^\*\w+\* (.*)$/ ) { -% $password = $1; -% - - (login disabled) -% } -% if ( $conf->exists('showpasswords') ) { - - 
<% encode_entities($password) %>
-% } else { - - (hidden) -% } - - - - -% $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 - %> - - -% } -% my %ulabel = ( seconds => 'Seconds', -% upbytes => 'Upload bytes', -% downbytes => 'Download bytes', -% totalbytes => 'Total bytes', -% ); -% foreach my $uf ( keys %ulabel ) { -% my $tf = $uf . "_threshold"; -% if ( $svc_acct->$tf ne '' ) { - - <% $ulabel{$uf} %> remaining - <% $svc_acct->$uf %> - - -% } -% } -% 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+$/ ) { +<% include( 'svc_acct/change_svc.html', + 'part_svc' => \@part_svc, + %gopt, + ) +%> - - 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($_)) %> -% } +<% include( 'svc_acct/basics.html', + 'svc_acct' => $svc_acct, + 'part_svc' => $part_svc, + %gopt, + ) +%> - -
-

- +
+ +<% include( 'svc_acct/hosting.html', + %gopt, + ) +%> + +%#remove this? does anybody even use it? it was a misunderstood customer +%#request IIRC? +% my $conf = new FS::Conf; +% if ( $conf->exists('svc_acct-notes') ) { +% warn 'WARNING: svc_acct-notes deprecated\n'; <% join("
", $conf->config('svc_acct-notes') ) %>

+% } + +<% include('elements/svc_export_settings.html', $svc_acct) %> <% joblisting({'svcnum'=>$svcnum}, 1) %> @@ -317,10 +78,11 @@ Service #<% $svcnum %> <%init> die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('View customer services') - || $FS::CurrentUser::CurrentUser->access_right('View customer'); #XXX remove me + 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+)$/; @@ -328,11 +90,11 @@ 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, + '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; @@ -353,12 +115,27 @@ my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); die "Unknown svcpart" unless $part_svc; my $svc = $part_svc->svc; -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; +my @part_svc = (); +if ($FS::CurrentUser::CurrentUser->access_right('Change customer service')) { + + 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 }, + } ); + } + +} + +my $communigate = scalar($part_svc->part_export('communigate_pro')); + # || scalar($part_svc->part_export('communigate_pro_singledomain')); + +my %gopt = ( 'communigate' => $communigate, + );