X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill_event.cgi;h=9fb533a5f1a3fe11997184d7150c3e9a347a95ed;hb=64489396dd98a369aa2c38d3802400c2c508f136;hp=51f9f8863aad9bdcc8fb19e875b2d394ed780c58;hpb=af81319b032830fdec2ba0bc51313a469c254aab;p=freeside.git
diff --git a/httemplate/search/cust_bill_event.cgi b/httemplate/search/cust_bill_event.cgi
index 51f9f8863..9fb533a5f 100644
--- a/httemplate/search/cust_bill_event.cgi
+++ b/httemplate/search/cust_bill_event.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $title,
'html_init' => $html_init,
'menubar' => $menubar,
@@ -60,8 +60,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
@@ -85,7 +85,7 @@ if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
= FS::UI::Web::parse_beginning_ending($cgi);
if ( $cgi->param('failed') ) {
- push $search{failed} = '1';
+ $search{failed} = '1';
}
if ( $cgi->param('part_bill_event.payby') =~ /^(\w+)$/ ) {
@@ -96,11 +96,11 @@ if ( $cgi->param('invnum') =~ /^(\d+)$/ ) {
$search{invnum} = $1;
}
-my $where = 'WHERE '. FS::cust_bill_event->search_sql( \%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 ) '.
- 'LEFT JOIN cust_main USING ( custnum ) ';
+ FS::UI::Web::join_cust_main('cust_bill');
my $sql_query = {
'table' => 'cust_bill_event',
@@ -113,7 +113,8 @@ 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,
};
@@ -121,8 +122,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.
';
@@ -142,16 +141,21 @@ $html_init .= join("\n", map {
qq!!
} qw( print_ email_ fax_ ) );
-my $menubar = [
- 'Re-print these events' =>
- "javascript:print_process()",
- 'Re-email these events' =>
- "javascript:email_process()",
- ];
+my $menubar = [];
+
+if ( $curuser->access_right('Resend invoices') ) {
+
+ push @$menubar, 'Re-print these events' =>
+ "javascript:print_process()",
+ 'Re-email these events' =>
+ "javascript:email_process()",
+ ;
-push @$menubar, 'Re-fax these events' =>
- "javascript:fax_process()"
- if $conf->exists('hylafax');
+ push @$menubar, 'Re-fax these events' =>
+ "javascript:fax_process()"
+ if $conf->exists('hylafax');
+
+}
my $link_cust = sub {
my $cust_bill_event = shift;