X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=747477989f0ed9453df5f90474e5484bd0bb7079;hp=c378094d93c8421a29815a99aaee77bcf7b761a4;hb=f822e27a1e00594332ffa487a1c284234c5580a6;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1 diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index c378094d9..747477989 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -1,338 +1,120 @@ % if ( $custnum ) { - <% include("/elements/header.html","View $svc account") %> - <% include( '/elements/small_custview.html', $custnum, '', 1, - "${p}view/cust_main.cgi") %> + <& /elements/header.html, mt("View [_1] account",$svc) &> + <& /elements/small_custview.html, $custnum, '', 1, + "${p}view/cust_main.cgi" &>
% } else { +% my $delmsg = emt('Permanently delete this account?'); - <% include("/elements/header.html",'Account View', menubar( - "Cancel this (unaudited) account" => + <& /elements/header.html, mt('View account'), menubar( + emt("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; -% -% +<& elements/svc_radius_usage.html, + 'svc' => $svc_acct, + 'part_svc' => $part_svc, + 'cust_pkg' => $cust_pkg, + %gopt, +&> - 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 }, -% } ); -% } -% - - -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 '') { +<& svc_acct/change_svc_form.html, + 'part_svc' => \@part_svc, + 'svcnum' => $svcnum, + 'pkgnum' => $pkgnum, + %gopt, +&> - - 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 '') { +<% mt('Service #') |h %><% $svcnum %> +<& /view/elements/svc_edit_link.html, 'svc' => $svc_acct &> +<& svc_acct/change_svc.html, + 'part_svc' => \@part_svc, + %gopt, +&> - - 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 => 'Time', -% upbytes => 'Upload bytes', -% downbytes => 'Download bytes', -% totalbytes => 'Total bytes', -% ); -% foreach my $uf ( keys %ulabel ) { -% my $tf = $uf . "_threshold"; -% if ( $svc_acct->$uf ne '' ) { -% my $v = $uf eq 'seconds' ? duration_exact($svc_acct->$uf) -% : FS::UI::bytecount::display_bytecount($svc_acct->$uf); - - <% $ulabel{$uf} %> remaining - <% $v %> - +<& svc_acct/basics.html, + 'svc_acct' => $svc_acct, + 'part_svc' => $part_svc, + 'cust_svc' => $cust_svc, + %gopt, +&> -% } + +
+ +<& svc_acct/cardfortress.html, + 'svc_acct' => $svc_acct, + %gopt, +&> + +<& 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') ) %> +

% } -% 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) %> - -% -%# 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($_)) %> -% } +<& elements/svc_export_status.html, $svc_acct &> - - -

+<& elements/svc_export_settings.html, $svc_acct &> -<% join("
", $conf->config('svc_acct-notes') ) %> -

+<& /elements/table-tickets.html, object => $cust_svc &> +
<% joblisting({'svcnum'=>$svcnum}, 1) %> -<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('View customer services') - || $FS::CurrentUser::CurrentUser->access_right('View customer'); #XXX remove me - -my $conf = new FS::Conf; - -my($query) = $cgi->keywords; + unless $FS::CurrentUser::CurrentUser->access_right('View customer services'); + +my $addl_from = ' LEFT JOIN cust_svc USING ( svcnum ) '. + ' LEFT JOIN cust_pkg USING ( pkgnum ) '. + ' LEFT JOIN cust_main USING ( custnum ) '; +my $query; +if ( $cgi->keywords ) { + ($query) = $cgi->keywords; +} else { + $query = $cgi->param('svcnum'); +} $query =~ /^(\d+)$/; 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; #false laziness w/all svc_*.cgi -my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } ); +my $cust_svc = $svc_acct->cust_svc; my $pkgnum = $cust_svc->getfield('pkgnum'); my($cust_pkg, $custnum); if ($pkgnum) { @@ -348,12 +130,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, + );