X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill_event.cgi;h=16c9acdc7bc0cf483a02ee7417b4ee00932b40bb;hb=89da4b96c4e2fce7079be8d2729750c088f8035b;hp=ffd95e976dc653ff4de223a7642208915d0a469d;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git
diff --git a/httemplate/search/cust_bill_event.cgi b/httemplate/search/cust_bill_event.cgi
index ffd95e976..16c9acdc7 100644
--- a/httemplate/search/cust_bill_event.cgi
+++ b/httemplate/search/cust_bill_event.cgi
@@ -75,36 +75,28 @@ my $title = $cgi->param('failed')
? 'Failed invoice events'
: 'Invoice events';
-my @search = ();
+my %search = ();
if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
- push @search, "agentnum = $1";
- #my $agent = qsearchs('agent', { 'agentnum' => $1 } );
- #die "unknown agentnum $1" unless $agent;
+ $search{agentnum} = $1;
}
-my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-push @search, "cust_bill_event._date >= $beginning",
- "cust_bill_event._date <= $ending";
+($search{beginning}, $search{ending})
+ = FS::UI::Web::parse_beginning_ending($cgi);
if ( $cgi->param('failed') ) {
- push @search, "statustext != ''",
- "statustext IS NOT NULL",
- "statustext != 'N/A'";
+ $search{failed} = '1';
}
if ( $cgi->param('part_bill_event.payby') =~ /^(\w+)$/ ) {
- push @search, "part_bill_event.payby = '$1'";
+ $search{payby} = $1;
}
if ( $cgi->param('invnum') =~ /^(\d+)$/ ) {
- push @search, "cust_bill_event.invnum = '$1'";
+ $search{invnum} = $1;
}
-#here is the agent virtualization
-push @search, $FS::CurrentUser::CurrentUser->agentnums_sql;
-
-my $where = 'WHERE '. join(' AND ', @search );
+my $where = 'WHERE '. FS::cust_bill_event->search_sql_where( \%search );
my $join = 'LEFT JOIN part_bill_event USING ( eventpart ) '.
'LEFT JOIN cust_bill USING ( invnum ) '.
@@ -129,8 +121,6 @@ my $count_sql = "SELECT COUNT(*) FROM cust_bill_event $join $where";
my $conf = new FS::Conf;
-my $failed = $cgi->param('failed');
-
my $html_init = '
Invoice events are the deprecated, old-style actions taken o
n open invoices. See Reports->Billing events->Billing events for current event reports.
';
@@ -139,29 +129,32 @@ $html_init .= join("\n", map {
( my $action = $_ ) =~ s/_$//;
include('/elements/progress-init.html',
$_.'form',
- [ 'action', 'beginning', 'ending', 'failed' ],
+ [ keys(%search) ],
"../misc/${_}invoice_events.cgi",
{ 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but...
$_, #key
),
qq!