Merge branch 'master' of https://github.com/jgoodman/Freeside

[freeside.git] / httemplate / search / sales_commission.html

diff --git a/httemplate/search/sales_commission.html b/httemplate/search/sales_commission.html
index b4d40ae..57b6cdc 100644 (file)
--- a/httemplate/search/sales_commission.html
+++ b/httemplate/search/sales_commission.html
@@ -33,9 +33,16 @@ my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 my %query = ( 'table' => 'sales' );
 my $count_query = "SELECT COUNT(*) FROM sales";
 
-my $salesnum;
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  $query{hashref}->{agentnum} = $1;
+  $count_query .= " WHERE agentnum = $1";
+}
+
+my $salesnum = '';
 if ( $cgi->param('salesnum') =~ /^(\d+)$/ ) {
   $salesnum = $1;
+} else {
+  $cgi->delete('salesnum');
 }
 
 my $title = 'Sales person commission';
@@ -43,13 +50,14 @@ $title .= ': '. time2str($date_format, $beginning). ' to '.
                 time2str($date_format, $ending)
   if $beginning;
 
+my $paid = $cgi->param('paid') ? 1 : 0;
+$title .= ' - paid sales only' if $paid;
+
 my $cust_main_sales = $cgi->param('cust_main_sales') eq 'Y' ? 'Y' : '';
 
 my $sales_link = [ 'sales_pkg_class.html?'.
-                     "begin=$beginning;".
-                     "end=$ending;".
-                     "cust_main_sales=$cust_main_sales;".
-                     "salesnum=",
+                   # pass all of our parameters along
+                   $cgi->query_string. ';salesnum=',
                    'salesnum'
                  ];
 
@@ -64,6 +72,7 @@ my $sales_sub_maker = sub {
       $beginning,
       $ending,
       'cust_main_sales' => $cust_main_sales,
+      'paid' => $paid,
     );
     $total += $_->get($field) foreach @cust_bill_pkg;