diff options
Diffstat (limited to 'httemplate/search/svc_acct.cgi')
-rwxr-xr-x | httemplate/search/svc_acct.cgi | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi index 62b276748..a7826e122 100755 --- a/httemplate/search/svc_acct.cgi +++ b/httemplate/search/svc_acct.cgi @@ -9,7 +9,9 @@ 'Account', 'UID', 'Last Login', - FS::UI::Web::cust_header(), + FS::UI::Web::cust_header( + $cgi->param('cust_fields') + ), ], 'fields' => [ 'svcnum', 'svc', @@ -24,7 +26,9 @@ $link, $link, ( map { $_ ne 'Cust. Status' ? $link_cust : '' } - FS::UI::Web::cust_header() + FS::UI::Web::cust_header( + $cgi->param('cust_fields') + ) ), ], 'align' => 'rlllr'. FS::UI::Web::cust_aligns(), @@ -90,6 +94,42 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) { $orderby = "ORDER BY $sortby"; } +} elsif ( $cgi->param('magic') =~ /^advanced$/ ) { + $orderby = ""; + + if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) { + push @extra_sql, "agentnum = $1"; + } + + my $pkgpart = join (' OR cust_pkg.pkgpart=', + grep {$_} map { /^(\d+)$/; } ($cgi->param('pkgpart'))); + push @extra_sql, '(cust_pkg.pkgpart=' . $pkgpart . ')' if $pkgpart; + + foreach my $field (qw( last_login last_logout )) { + + my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field); + + next if $beginning == 0 && $ending == 4294967295; + + if ($cgi->param($field."_invert")) { + push @extra_sql, + "(svc_acct.$field IS NULL OR ". + "svc_acct.$field < $beginning AND ". + "svc_acct.$field > $ending)"; + } else { + push @extra_sql, + "svc_acct.$field IS NOT NULL", + "svc_acct.$field >= $beginning", + "svc_acct.$field <= $ending"; + } + + $orderby ||= "ORDER BY svc_acct.$field" . + ($cgi->param($field."_invert") ? ' DESC' : ''); + + } + + $orderby ||= "ORDER BY svcnum"; + } elsif ( $cgi->param('popnum') =~ /^(\d+)$/ ) { push @extra_sql, "popnum = $1"; $orderby = "ORDER BY LOWER(username)"; |