X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_receivables.cgi;h=58d87fa5359292a12e8970594f1a73839388158a;hb=5f3a89734813a7a2da10e517de92e9c92a22830c;hp=b4d41dda8e610b606c245b832d08cca0867e0bae;hpb=cef858577f15128880dacbc944f20aa3142919ec;p=freeside.git
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index b4d41dda8..58d87fa53 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -19,28 +19,23 @@
)
),
sprintf( $money_char.'%.2f',
- $row->{'owed_0_30'} ),
+ $row->{'balance_0_30'} ),
sprintf( $money_char.'%.2f',
- $row->{'owed_30_60'} ),
+ $row->{'balance_30_60'} ),
sprintf( $money_char.'%.2f',
- $row->{'owed_60_90'} ),
+ $row->{'balance_60_90'} ),
sprintf( $money_char.'%.2f',
- $row->{'owed_90_0'} ),
+ $row->{'balance_90_0'} ),
sprintf( ''. $money_char.'%.2f'. '',
- $row->{'owed_0_0'} ),
+ $row->{'balance_0_0'} ),
],
'fields' => [
\&FS::UI::Web::cust_fields,
- sub { sprintf( $money_char.'%.2f',
- shift->get('owed_0_30') ) },
- sub { sprintf( $money_char.'%.2f',
- shift->get('owed_30_60') ) },
- sub { sprintf( $money_char.'%.2f',
- shift->get('owed_60_90') ) },
- sub { sprintf( $money_char.'%.2f',
- shift->get('owed_90_0') ) },
- sub { sprintf( $money_char.'%.2f',
- shift->get('owed_0_0') ) },
+ format_balance('0_30'),
+ format_balance('30_60'),
+ format_balance('60_90'),
+ format_balance('90_0'),
+ format_balance('0_0'),
],
'links' => [
( map { $_ ne 'Cust. Status' ? $clink : '' }
@@ -73,61 +68,6 @@
)
%>
-<%once>
-
-sub owed {
- my($start, $end, %opt) = @_;
-
- my @where = ();
-
- #handle start and end ranges
-
- my $str2time = str2time_sql;
-
- #24h * 60m * 60s
- push @where, "cust_bill._date <= $str2time now() ) - ". ($start * 86400)
- if $start;
-
- push @where, "cust_bill._date > $str2time now() ) - ". ($end * 86400)
- if $end;
-
- #handle 'cust' option
-
- push @where, "cust_main.custnum = cust_bill.custnum"
- if $opt{'cust'};
-
- #handle 'agentnum' option
- my $join = '';
- if ( $opt{'agentnum'} ) {
- $join = 'LEFT JOIN cust_main USING ( custnum )';
- push @where, "agentnum = '$opt{'agentnum'}'";
- }
-
- my $where = scalar(@where) ? 'WHERE '.join(' AND ', @where) : '';
-
- my $as = $opt{'noas'} ? '' : "as owed_${start}_$end";
-
- my $charged = <
<%init>
die "access denied"
@@ -141,7 +81,7 @@ my @ranges = (
[ 0, 0 ],
);
-my $owed_cols = join(',', map owed( @$_, 'cust'=>1 ), @ranges );
+my $owed_cols = join(',', map balance( @$_ ), @ranges );
my $select_count_pkgs = FS::cust_main->select_count_pkgs_sql;
@@ -158,42 +98,100 @@ my $packages_cols = <param('days') =~ /^\s*(\d+)\s*$/ ) {
- $days = $1;
-}
+my @where = ();
-#my $where = "where ". owed(0, 0, 'cust'=>1, 'noas'=>1). " > 0";
-my $where = "where ". owed($days, 0, 'cust'=>1, 'noas'=>1). " > 0";
+unless ( $cgi->param('all_customers') ) {
+
+ my $days = 0;
+ if ( $cgi->param('days') =~ /^\s*(\d+)\s*$/ ) {
+ $days = $1;
+ }
+
+ push @where, balance($days, 0, 'no_as'=>1). ' > 0'; # != 0';
+
+}
-my $agentnum = '';
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
- $agentnum = $1;
- $where .= " AND agentnum = '$agentnum' ";
+ my $agentnum = $1;
+ push @where, "agentnum = $agentnum";
}
#here is the agent virtualization
-$where .= ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql;
+push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+my $where = join(' AND ', @where);
+$where = "WHERE $where" if $where;
my $count_sql = "select count(*) from cust_main $where";
my $sql_query = {
'table' => 'cust_main',
'hashref' => {},
- 'select' => "*, $owed_cols, $packages_cols",
- 'extra_sql' => "$where order by coalesce(lower(company), ''), lower(last)",
+ 'select' => join(',',
+ #'cust_main.*',
+ 'custnum',
+ $owed_cols,
+ $packages_cols,
+ FS::UI::Web::cust_sql_fields(),
+ ),
+ 'extra_sql' => $where,
+ 'order_by' => "order by coalesce(lower(company), ''), lower(last)",
};
-my $total_sql = "select ".
- join(',', map owed( @$_, 'agentnum'=>$agentnum ), @ranges );
+my $total_sql = "SELECT ". join(',', map balance( @$_, 'sum'=>1 ), @ranges).
+ " FROM cust_main $where";
my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
$total_sth->execute or die "error executing $total_sql: ". $total_sth->errstr;
my $row = $total_sth->fetchrow_hashref();
+my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+
+
+<%once>
+
my $conf = new FS::Conf;
+
my $money_char = $conf->config('money_char') || '$';
-my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+#Example:
+#
+# my $balance = balance(
+# $start, $end,
+# 'no_as' => 1, #set to true when using in a WHERE clause (supress AS clause)
+# #or 0 / omit when using in a SELECT clause as a column
+# # ("AS balance_$start_$end")
+# 'sum' => 1, #set to true to get a SUM() of the values, for totals
+#
+# #obsolete? options for totals (passed to cust_main::balance_date_sql)
+# 'total' => 1, #set to true to remove all customer comparison clauses
+# 'join' => $join, #JOIN clause
+# 'where' => \@where, #WHERE clause hashref (elements "AND"ed together)
+# )
+
+sub balance {
+ my($start, $end, %opt) = @_;
-
+ my $as = $opt{'no_as'} ? '' : " AS balance_${start}_$end";
+
+ #handle start and end ranges (86400 = 24h * 60m * 60s)
+ my $str2time = str2time_sql;
+ my $closing = str2time_sql_closing;
+ $start = $start ? "( $str2time now() $closing - ".($start * 86400). ' )' : '';
+ $end = $end ? "( $str2time now() $closing - ".($end * 86400). ' )' : '';
+
+ $opt{'unapplied_date'} = 1;
+
+ ( $opt{sum} ? 'SUM( ' : '' ).
+ FS::cust_main->balance_date_sql( $start, $end, %opt ).
+ ( $opt{sum} ? ' )' : '' ).
+ $as;
+
+}
+
+sub format_balance { #closures help alot
+ my $range = shift;
+ sub { sprintf( $money_char.'%.2f', shift->get("balance_$range") ) };
+}
+
+