X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_cust_bill_pkg_discount.html;h=6412379f2c0a8184e8e72356eb2d54e98f0348be;hp=f9ab901b5a93888bf5ee83f957bf226e339a7663;hb=f30eaaf66cd0a947f388a03edd4522ba92a367bb;hpb=fb4ab1073f0d15d660c6cdc4e07afebf68ef3924

diff --git a/httemplate/search/report_cust_bill_pkg_discount.html b/httemplate/search/report_cust_bill_pkg_discount.html
index f9ab901b5..6412379f2 100644
--- a/httemplate/search/report_cust_bill_pkg_discount.html
+++ b/httemplate/search/report_cust_bill_pkg_discount.html
@@ -1,30 +1,41 @@
-<% include('/elements/header.html', 'Discount report' ) %>
+<& /elements/header.html, 'Discount report' &>
 
 <FORM ACTION="cust_bill_pkg_discount.html" METHOD="GET">
 
 
 <TABLE>
 
-  <% include( '/elements/tr-select-user.html',
-                'label'       => 'Discounts by employee: ',
-                'access_user' => \%access_user,
-            )
-  %>
-
-  <% include( '/elements/tr-select-agent.html',
-                 'curr_value'    => scalar( $cgi->param('agentnum') ),
-                 'label'         => 'for agent: ',
-                 'disable_empty' => 0,
-             )
-  %>
-
-  <% include( '/elements/tr-input-beginning_ending.html' ) %>
-
-  <% include( '/elements/tr-input-lessthan_greaterthan.html',
-                'label' => 'Amount',
-		'field' => 'amount',
-            )
-  %>
+  <& /elements/tr-select-discount_class.html,
+       'field'       => 'discount_classnum',
+       'pre_options' => [ '0' => 'all' ],
+       'empty_label' => '(none)'
+  &>
+
+  <& /elements/tr-select-user.html,
+       'label'       => 'Discounts by employee: ',
+       'access_user' => $access_user,
+  &>
+
+  <& /elements/tr-select-agent.html,
+       'curr_value'    => scalar( $cgi->param('agentnum') ),
+       'label'         => 'for agent: ',
+       'disable_empty' => 0,
+  &>
+
+  <& /elements/tr-input-beginning_ending.html &>
+
+  <& /elements/tr-checkbox.html,
+        label => 'Include waived setup fees:',
+        field => 'include_waived_setup',
+        value => 'Y',
+  &>
+
+<!-- doesn't actually work yet, needs support in cust_bill_pkg_discount.html
+  <& /elements/tr-input-lessthan_greaterthan.html,
+       'label' => 'Amount',
+       'field' => 'amount',
+  &>
+-->
 
 </TABLE>
 
@@ -33,18 +44,12 @@
 
 </FORM>
 
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
 
-my $sth = dbh->prepare("SELECT DISTINCT usernum FROM cust_pkg_discount")
-  or die dbh->errstr;
-$sth->execute or die $sth->errstr;
-my @usernum = map $_->[0], @{$sth->fetchall_arrayref};
-my %access_user =
-  map { $_ => qsearchs('access_user',{'usernum'=>$_})->username }
-      @usernum;
+my $access_user = $FS::CurrentUser::CurrentUser->access_users_hashref('table' => 'cust_pkg_discount');
 
 </%init>