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';
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'
];
sub {
my $sales = shift;
- #efficiency improvement: ask the db for a sum instead of all the records
- my $total = 0;
- my @cust_bill_pkg = $sales->cust_bill_pkg(
+ my $search = $sales->cust_bill_pkg_search(
$beginning,
$ending,
'cust_main_sales' => $cust_main_sales,
+ 'paid' => $paid,
+ );
+ die 'cust_bill_pkg_search hashref not yet handled' if $search->{hashref};
+
+ my $total = FS::Record->scalar_sql(
+ "SELECT SUM(cust_bill_pkg.$field) FROM cust_bill_pkg ". #$search->{table}
+ $search->{addl_from}. ' '. $search->{extra_sql}
);
- $total += $_->get($field) foreach @cust_bill_pkg;
- $money_char. sprintf('%.2f', $total);
+ return $money_char. sprintf('%.2f', $total);
};
};
my $sales = shift;
#efficiency improvement: ask the db for a sum instead of all the records
- my $total_credit = 0;
- my @cust_credit = $sales->cust_credit( $beginning, $ending );
- $total_credit += $_->amount foreach @cust_credit;
+ #my $total_credit = 0;
+ #my @cust_credit = $sales->cust_credit( $beginning, $ending );
+ #$total_credit += $_->amount foreach @cust_credit;
+
+ my $search = $sales->cust_credit_search( $beginning, $ending );
+
+ my $sql =
+ "SELECT SUM(cust_credit.amount) FROM cust_credit ". #$search->{table}
+ $search->{addl_from}. ' '.
+ ' WHERE commission_salesnum = ? '. #$search->{hashref}
+ $search->{extra_sql};
+
+ my $total = FS::Record->scalar_sql($sql, $sales->salesnum);
- $money_char. sprintf('%.2f', $total_credit);
+ $money_char. sprintf('%.2f', $total);
};
my $commission_link = [ 'cust_credit.html?'.