X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fcust_main_dayranges.html;h=91e039d285b0c513fcca778cb5a6151e0d85b554;hb=636dd1f25af52d35efe7a323a5765ff5adeadf83;hp=3ab5941811f3bbe269a0a64b85b551b16ed3bbf4;hpb=0cc20c3d66e50d640422c2d587d97ddf7768493b;p=freeside.git
diff --git a/httemplate/search/elements/cust_main_dayranges.html b/httemplate/search/elements/cust_main_dayranges.html
index 3ab594181..91e039d28 100644
--- a/httemplate/search/elements/cust_main_dayranges.html
+++ b/httemplate/search/elements/cust_main_dayranges.html
@@ -11,6 +11,7 @@ Example:
my( $start, $end ) = @_;
"SQL EXPRESSION BASED ON $start AND $end";
+ # where $start and $end are unix timestamps
};
@@ -18,21 +19,23 @@ Example:
'name' => 'customers',
'query' => $sql_query,
'count_query' => $count_sql,
- 'header' => [
+ 'header' => [
FS::UI::Web::cust_header(),
'0-30',
'30-60',
'60-90',
'90+',
'Total',
+ @pay_head,
],
'footer' => [
'Total',
( map '',
( 1 ..
scalar(FS::UI::Web::cust_header()-1)
- )
+ ),
),
+
sprintf( $money_char.'%.2f',
$row->{'rangecol_0_30'} ),
sprintf( $money_char.'%.2f',
@@ -43,14 +46,16 @@ Example:
$row->{'rangecol_90_0'} ),
sprintf( ''. $money_char.'%.2f'. '',
$row->{'rangecol_0_0'} ),
+ ('') x @pay_labels,
],
'fields' => [
- \&FS::UI::Web::cust_fields,
+ FS::UI::Web::cust_fields_subs(),
format_rangecol('0_30'),
format_rangecol('30_60'),
format_rangecol('60_90'),
format_rangecol('90_0'),
format_rangecol('0_0'),
+ @pay_labels,
],
'links' => [
( map { $_ ne 'Cust. Status' ? $clink : '' }
@@ -61,17 +66,24 @@ Example:
'',
'',
'',
+ @pay_links,
],
#'align' => 'rlccrrrrr',
- 'align' => FS::UI::Web::cust_aligns(). 'rrrrr',
+ 'align' => FS::UI::Web::cust_aligns().
+ 'rrrrr'.
+ ('c' x @pay_labels),
#'size' => [ '', '', '-1', '-1', '', '', '', '', '', ],
#'style' => [ '', '', 'b', 'b', '', '', '', '', 'b', ],
'size' => [ ( map '', FS::UI::Web::cust_header() ),
#'-1', '', '', '', '', '', ],
- '', '', '', '', '', ],
+ '', '', '', '', '', '',
+ ( map '', @pay_labels ),
+ ],
'style' => [ FS::UI::Web::cust_styles(),
#'b', '', '', '', '', 'b', ],
- '', '', '', '', 'b', ],
+ '', '', '', '', 'b',
+ ( map '', @pay_labels ),
+ ],
'color' => [
FS::UI::Web::cust_colors(),
'',
@@ -79,6 +91,8 @@ Example:
'',
'',
'',
+ '',
+ ( map '', @pay_labels ),
],
%opt,
)
@@ -88,7 +102,7 @@ Example:
my %opt = @_;
#actually need to auto-generate other things too for a passed-in ranges to work
-my @ranges = $opt{'ranges'} ? @{ delete($opt{'ranges'}) } : [
+my $ranges = $opt{'ranges'} ? delete($opt{'ranges'}) : [
[ 0, 30 ],
[ 30, 60 ],
[ 60, 90 ],
@@ -98,8 +112,14 @@ my @ranges = $opt{'ranges'} ? @{ delete($opt{'ranges'}) } : [
my $range_sub = delete($opt{'range_sub'}); #or die
+my $offset = 0;
+if($cgi->param('as_of')) {
+ $offset = int((time - parse_datetime($cgi->param('as_of'))) / 86400);
+ $opt{'title'} .= ' ('.$cgi->param('as_of').')' if $offset > 0;
+}
+
#my $range_cols = join(',', map &{$range_sub}( @$_ ), @ranges );
-my $range_cols = join(',', map call_range_sub($range_sub, @$_ ), @ranges );
+my $range_cols = join(',', map call_range_sub($range_sub, @$_, 'offset' => $offset ), @$ranges );
my $select_count_pkgs = FS::cust_main->select_count_pkgs_sql;
@@ -119,14 +139,18 @@ END
my @where = ();
unless ( $cgi->param('all_customers') ) {
-
+# Exclude entire cust_main records where the balance is >0
my $days = 0;
if ( $cgi->param('days') =~ /^\s*(\d+)\s*$/ ) {
$days = $1;
}
+ # If this is set, allow cust_main records with nonzero balances
+ my $negative = $cgi->param('negative') || 0;
+
push @where,
- call_range_sub($range_sub, $days, 0, 'no_as'=>1). ' > 0'; # != 0';
+ call_range_sub($range_sub, $days, 0, 'offset' => $offset, 'no_as'=>1).
+ ($negative ? ' != 0' : ' > 0');
}
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
@@ -157,9 +181,10 @@ my $sql_query = {
'select' => join(',',
#'cust_main.*',
'custnum',
- $owed_cols,
+ $range_cols,
$packages_cols,
FS::UI::Web::cust_sql_fields(),
+ 'payby',
),
'extra_sql' => $where,
'order_by' => "order by coalesce(lower(company), ''), lower(last)",
@@ -167,7 +192,7 @@ my $sql_query = {
my $total_sql =
"SELECT ".
- join(',', map call_range_sub( $range_sub, @$_, 'sum'=>1 ), @ranges).
+ join(',', map call_range_sub( $range_sub, @$_, 'offset' => $offset, 'sum'=>1 ), @$ranges).
" FROM cust_main $where";
my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
@@ -176,10 +201,39 @@ my $row = $total_sth->fetchrow_hashref();
my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+my (@payby, @pay_head, @pay_labels, @pay_links);
+
+my %payby = map {$_ => 1} $conf->config('payby');
+if(%payby) {
+ push @payby, 'CARD' if ($payby{'CARD'} or $payby{'DCRD'});
+ push @payby, 'CHEK' if ($payby{'CHEK'} or $payby{'DCHK'});
+}
+else {
+ @payby = ('CARD','CHEK')
+}
+
+if($opt{'payment_links'} && $curuser->access_right('Process payment') && @payby) {
+ my %label = ( CARD => 'Card',
+ CHEK => 'E-Check' );
+ push @pay_head, ({nodownload => 1}) foreach @payby;
+ $pay_head[0] = { label => 'Process',
+ nodownload => 1,
+ colspan => scalar(@payby) };
+
+ @pay_labels = (map { my $payby = $_;
+ my $label = $label{$payby};
+ sub {($payby eq $_[0]->payby) ? "$label (on file)" : $label}
+ } @payby );
+
+ @pay_links = (map { [ "${p}misc/payment.cgi?payby=$_;custnum=", 'custnum' ] }
+ @payby );
+}
+
<%once>
my $conf = new FS::Conf;
+my $curuser = $FS::CurrentUser::CurrentUser;
my $money_char = $conf->config('money_char') || '$';
@@ -199,11 +253,25 @@ my $money_char = $conf->config('money_char') || '$';
# )
sub call_range_sub {
- my($range_sub, $start, $end, %opt) = @_;
+ my($range_sub, $startdays, $enddays, %opt) = @_;
+
+ my $as = $opt{'no_as'} ? '' : " AS rangecol_${startdays}_$enddays";
+
+ my $offset = $opt{'offset'} || 0;
+ # Always use $offset - 1day + 1sec = the last second of that day
+ my $cutoff = DateTime->now->set(hour => 23, minute => 59, second => 59);
+ $cutoff->subtract(days => $offset);
- my $as = $opt{'no_as'} ? '' : " AS rangecol_${start}_$end";
+ my $start = $cutoff->clone;
+ $start->subtract(days => $startdays);
+
+ my $end = $cutoff->clone;
+ $end->subtract(days => $enddays);
- my $sql = &{$range_sub}( $start, $end ); #%opt?
+ #warn "offset $offset (".$cutoff->epoch."), range $startdays-$enddays (".$start->epoch . '-' . ($enddays ? $end->epoch : '').")\n";
+ my $sql = &{$range_sub}( $start->epoch,
+ $enddays ? $end->epoch : '',
+ $cutoff->epoch ); #%opt?
$sql = "SUM($sql)" if $opt{'sum'};
@@ -211,7 +279,7 @@ sub call_range_sub {
}
-sub format_range { #closures help alot
+sub format_rangecol { #closures help alot
my $range = shift;
sub { sprintf( $money_char.'%.2f', shift->get("rangecol_$range") ) };
}