diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-07-31 03:57:07 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-07-31 03:57:07 -0700 |
| commit | 1f9cad18af5742ee646a56bc0d5a40e6775eabab (patch) | |
| tree | 4527a0ef4c88a0efce805ee798767267e8261dda /FS/FS/vend_bill.pm | |
| parent | f264598260908d2442fe1aed2ce3784ce51254e6 (diff) | |
simple A/P
Diffstat (limited to 'FS/FS/vend_bill.pm')
| -rw-r--r-- | FS/FS/vend_bill.pm | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/FS/FS/vend_bill.pm b/FS/FS/vend_bill.pm index cd20f95..81de694 100644 --- a/FS/FS/vend_bill.pm +++ b/FS/FS/vend_bill.pm @@ -202,15 +202,26 @@ sub search { "vend_bill._date < $ending"; } + #_date + if ( $param->{payment_date} ) { + my($beginning, $ending) = @{$param->{payment_date}}; + + push @where, "vend_pay._date >= $beginning", + "vend_pay._date < $ending"; + } + my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : ''; - #my $count_query = "SELECT COUNT(*) FROM vend_bill $addl_from $extra_sql"; - my $count_query = "SELECT COUNT(*), SUM(charged) FROM vend_bill $extra_sql"; + #simplistic, but how we are for now + my $addl_from = ' LEFT JOIN vend_bill_pay USING (vendbillnum) '. + ' LEFT JOIN vend_pay USING (vendpaynum) '; + + my $count_query = "SELECT COUNT(*), SUM(charged) FROM vend_bill $addl_from $extra_sql"; +{ 'table' => 'vend_bill', - #'select' => $select, - #'addl_from' => $addl_from, + 'select' => 'vend_bill.*, vend_pay._date as payment_date', + 'addl_from' => $addl_from, 'hashref' => {}, 'extra_sql' => $extra_sql, 'order_by' => 'ORDER BY _date', |