X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_event.html;h=deb34b9e5b5da9b284a42f4b1defa0f45ae188e6;hb=cf7cd8efc7095aadbdfb0cd8e7ea0e2e8b9e9085;hp=715d1ca9aebcc25fd3340fa6c9674af6b9d66a8a;hpb=d57a1feb48c55fecb95502e894575eebb306a58a;p=freeside.git
diff --git a/httemplate/search/cust_event.html b/httemplate/search/cust_event.html
index 715d1ca9a..deb34b9e5 100644
--- a/httemplate/search/cust_event.html
+++ b/httemplate/search/cust_event.html
@@ -75,29 +75,34 @@ my $status_sub = sub {
my $part_event = $cust_event->part_event;
- if ( $part_event->eventtable eq 'cust_bill' && $part_event->templatename ) {
- my $alt_templatename = $part_event->templatename;
- my $alt_link = "$alt_templatename-". $cust_event->tablenum;
+ if ( $part_event->eventtable eq 'cust_bill'
+ && ( $part_event->templatename || $part_event->option('notice_name') )
+ )
+ {
+ my $link = 'invnum='. $cust_event->tablenum;
+ $link .= ';template='. uri_escape($part_event->templatename)
+ if $part_event->templatename;
+ $link .= ';notice_name='. uri_escape($part_event->option('notice_name'))
+ if $part_event->option('notice_name');
my $conf = new FS::Conf;
my $cust_bill = $cust_event->cust_X;
$status .= qq{
- ( view
- | view
- typeset
- | re-print
+ ( view
+ | view typeset
+ | re-print
};
if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
$status .= qq{
- | re-email
+ | re-email
};
}
if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) {
$status .= qq{
- | re-fax
+ | re-fax
}
}
@@ -152,17 +157,23 @@ my $title = $cgi->param('failed') ? 'Failed billing events' : 'Billing events';
my %search = ();
-my @scalars = qw ( agentnum custnum invnum pkgnum failed );
-for my $param ( @scalars ) {
+my @scalars = qw( agentnum status custnum invnum pkgnum failed );
+for my $param (@scalars) {
$search{$param} = scalar( $cgi->param($param) )
if $cgi->param($param);
}
+#lists
+my @lists = qw( payby eventpart );
+foreach my $param (@lists) {
+ $search{$param} = [ $cgi->param($param) ];
+}
+
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
$search{'beginning'} = $beginning;
$search{'ending'} = $ending;
-my $where = ' WHERE '. FS::cust_event->search_sql( \%search );
+my $where = ' WHERE '. FS::cust_event->search_sql_where( \%search );
my $join = FS::cust_event->join_sql();
@@ -177,8 +188,10 @@ my $sql_query = {
FS::UI::Web::cust_sql_fields(),
),
'hashref' => {},
- 'extra_sql' => "$where ORDER BY _date ASC",
+ 'extra_sql' => $where,
+ 'order_by' => 'ORDER BY _date ASC',
'addl_from' => $join,
+ 'debug' => 2,
};
my $count_sql = "SELECT COUNT(*) FROM cust_event $join $where";
@@ -203,6 +216,11 @@ my $html_init = join("\n", map {
}
@params #keys %search
),
+ ( map { my $value = encode_entities( join(',', @{ $search{$_} } ) );
+ qq();
+ }
+ @lists
+ ),
qq!!
} qw( print_ email_ fax_ ) ).