summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjeff <jeff>2007-12-28 19:02:28 +0000
committerjeff <jeff>2007-12-28 19:02:28 +0000
commitef8ee716b93223ecc55ca5a29664eca481c58dad (patch)
treea6ca4bba1db6882f5546f54ec19dabda39158852
parent9c8ff35a8e13e6dc650340c877524d2e42096d49 (diff)
advanced account reports (RT#2954)
-rw-r--r--httemplate/elements/menu.html6
-rwxr-xr-xhttemplate/search/report_svc_acct.html91
-rwxr-xr-xhttemplate/search/svc_acct.cgi40
3 files changed, 135 insertions, 2 deletions
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index a3a17c253..5908dbc83 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -105,6 +105,7 @@ foreach my $svcdb ( FS::part_svc->svc_tables() ) {
my $name = "FS::$svcdb"->table_info->{'name_plural'}
|| PL( "FS::$svcdb"->table_info->{'name'} );
my $lcname = lc($name);
+ my $lcsname = lc("FS::$svcdb"->table_info->{'name'});
my $longname = "FS::$svcdb"->table_info->{'longname_plural'} || $name;
my $lclongname = lc($longname);
my $sorts = "FS::$svcdb"->table_info->{'sorts'} || [ 'svcnum' ];
@@ -145,6 +146,11 @@ foreach my $svcdb ( FS::part_svc->svc_tables() ) {
];
}
+ if ( $svcdb eq 'svc_acct' ) {
+ $report_svc{"Advanced $lcsname reports"} =
+ [ $fsurl."search/report_$svcdb.html", '' ];
+ }
+
$report_services{$name} = [ \%report_svc, $longname ];
}
diff --git a/httemplate/search/report_svc_acct.html b/httemplate/search/report_svc_acct.html
new file mode 100755
index 000000000..f5a0ff903
--- /dev/null
+++ b/httemplate/search/report_svc_acct.html
@@ -0,0 +1,91 @@
+<% include('/elements/header.html', 'Account Report' ) %>
+
+<FORM ACTION="svc_acct.cgi" METHOD="GET">
+<INPUT TYPE="hidden" NAME="magic" VALUE="advanced">
+
+ <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+
+ <TR>
+ <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Search options</FONT></TH>
+ </TR>
+ <% include( '/elements/tr-select-agent.html',
+ ($cgi->param('agentnum') || ''),
+ )
+ %>
+
+ <SCRIPT type="text/javascript">
+ function toggle(what) {
+ label = document.getElementById (what + '_label');
+ field = document.getElementById ( what + '_invert');
+ if (field.value == 1) {
+ field.value = 0;
+ } else {
+ field.value = 1;
+ }
+ if (field.value == 1) {
+ label.firstChild.nodeValue = 'Did not ' + label.firstChild.nodeValue;
+ }else{
+ text = label.firstChild.nodeValue;
+ label.firstChild.nodeValue = text.replace(/Did not /, '');
+ }
+ }
+ </SCRIPT>
+% foreach my $field (qw( last_login last_logout )) {
+% my $invert = $field."_invert";
+
+ <TR>
+ <TD>
+ <TABLE>
+ <TR>
+ <TD ALIGN="right" VALIGN="center" ID="<% $field."_label" %>">
+ <% $label{$field} %>
+ </TD>
+ <TD>
+ <INPUT NAME="<% $invert %>" ID="<% $invert %>" TYPE="hidden">
+ <A HREF="javascript:void(0)" onClick="toggle('<% $field %>'); return false;">Invert</A>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD>
+ <TABLE>
+ <% include( '/elements/tr-input-beginning_ending.html',
+ prefix => $field,
+ layout => 'horiz',
+ )
+ %>
+ </TABLE>
+ </TD>
+ </TR>
+
+% }
+
+ <% include( '/elements/tr-selectmultiple-part_pkg.html' ) %>
+
+ <TR>
+ <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Display options</FONT></TH>
+ </TR>
+ <% include( '/elements/tr-select-cust-fields.html' ) %>
+
+ </TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<% include('/elements/footer.html') %>
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('List packages');
+
+</%init>
+<%once>
+
+my %label = (
+ 'last_login' => 'Last login',
+ 'last_logout' => 'Last logout',
+);
+
+</%once>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index a3609a2ed..afdc5da47 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -167,6 +167,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)";
@@ -218,10 +254,10 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
}
-push @header, FS::UI::Web::cust_header();
+push @header, FS::UI::Web::cust_header($cgi->param('cust_fields'));
push @fields, \&FS::UI::Web::cust_fields,
push @links, map { $_ ne 'Cust. Status' ? $link_cust : '' }
- FS::UI::Web::cust_header();
+ FS::UI::Web::cust_header($cgi->param('cust_fields'));
$align .= FS::UI::Web::cust_aligns();
push @color, FS::UI::Web::cust_colors();
push @style, FS::UI::Web::cust_styles();