projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
byproduct #31593
[freeside.git]
/
httemplate
/
search
/
elements
/
cust_main_dayranges.html
diff --git
a/httemplate/search/elements/cust_main_dayranges.html
b/httemplate/search/elements/cust_main_dayranges.html
index
9b8b08f
..
5dbece8
100644
(file)
--- a/
httemplate/search/elements/cust_main_dayranges.html
+++ b/
httemplate/search/elements/cust_main_dayranges.html
@@
-2,10
+2,10
@@
Example:
Example:
-
include( 'elements/cust_main_dayranges.html'
,
+
<& elements/cust_main_dayranges.html
,
'title' => 'Accounts Receivable Aging Summary',
'range_sub' => $mysub,
'title' => 'Accounts Receivable Aging Summary',
'range_sub' => $mysub,
- )
+ &>
my $mysub = sub {
my( $start, $end ) = @_;
my $mysub = sub {
my( $start, $end ) = @_;
@@
-15,27
+15,22
@@
Example:
};
</%doc>
};
</%doc>
-<
% include( 'search.html'
,
+<
& search.html
,
'name' => 'customers',
'query' => $sql_query,
'count_query' => $count_sql,
'name' => 'customers',
'query' => $sql_query,
'count_query' => $count_sql,
- 'header' => [
-
FS::UI::Web::cust_header()
,
+ 'header' => [
+
@cust_header
,
'0-30',
'30-60',
'60-90',
'90+',
'0-30',
'30-60',
'60-90',
'90+',
-
'Total'
,
+
emt('Total')
,
@pay_head,
],
'footer' => [
'Total',
@pay_head,
],
'footer' => [
'Total',
- ( map '',
- ( 1 ..
- scalar(FS::UI::Web::cust_header()-1)
- ),
- ),
-
+ ( map '',( 1 .. $#cust_header ),),
sprintf( $money_char.'%.2f',
$row->{'rangecol_0_30'} ),
sprintf( $money_char.'%.2f',
sprintf( $money_char.'%.2f',
$row->{'rangecol_0_30'} ),
sprintf( $money_char.'%.2f',
@@
-44,7
+39,7
@@
Example:
$row->{'rangecol_60_90'} ),
sprintf( $money_char.'%.2f',
$row->{'rangecol_90_0'} ),
$row->{'rangecol_60_90'} ),
sprintf( $money_char.'%.2f',
$row->{'rangecol_90_0'} ),
- sprintf( '<b>'.
$money_char.'%.2f'. '
</b>',
+ sprintf( '<b>'.
$money_char.'%.2f
</b>',
$row->{'rangecol_0_0'} ),
('') x @pay_labels,
],
$row->{'rangecol_0_0'} ),
('') x @pay_labels,
],
@@
-59,7
+54,7
@@
Example:
],
'links' => [
( map { $_ ne 'Cust. Status' ? $clink : '' }
],
'links' => [
( map { $_ ne 'Cust. Status' ? $clink : '' }
- FS::UI::Web::cust_header()
+ @cust_header
),
'',
'',
),
'',
'',
@@
-68,13
+63,10
@@
Example:
'',
@pay_links,
],
'',
@pay_links,
],
- #'align' => 'rlccrrrrr',
'align' => FS::UI::Web::cust_aligns().
'rrrrr'.
('c' x @pay_labels),
'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() ),
+ 'size' => [ ( map '', @cust_header ),
#'-1', '', '', '', '', '', ],
'', '', '', '', '', '',
( map '', @pay_labels ),
#'-1', '', '', '', '', '', ],
'', '', '', '', '', '',
( map '', @pay_labels ),
@@
-84,6
+76,9
@@
Example:
'', '', '', '', 'b',
( map '', @pay_labels ),
],
'', '', '', '', 'b',
( map '', @pay_labels ),
],
+ 'xls_format' => [ (map '', FS::UI::Web::cust_styles),
+ '', '', '', '', { bold => 1 },
+ ],
'color' => [
FS::UI::Web::cust_colors(),
'',
'color' => [
FS::UI::Web::cust_colors(),
'',
@@
-95,10
+90,10
@@
Example:
( map '', @pay_labels ),
],
%opt,
( map '', @pay_labels ),
],
%opt,
- )
-%>
+&>
<%init>
<%init>
+my @cust_header = FS::UI::Web::cust_header($cgi->param('cust_fields'));
my %opt = @_;
#actually need to auto-generate other things too for a passed-in ranges to work
my %opt = @_;
#actually need to auto-generate other things too for a passed-in ranges to work
@@
-112,14
+107,14
@@
my $ranges = $opt{'ranges'} ? delete($opt{'ranges'}) : [
my $range_sub = delete($opt{'range_sub'}); #or die
my $range_sub = delete($opt{'range_sub'}); #or die
-my $
offset = 0
;
+my $
as_of
;
if($cgi->param('as_of')) {
if($cgi->param('as_of')) {
- $
offset = int((time - parse_datetime($cgi->param('as_of'))) / 86400)
;
- $opt{'title'} .= ' ('.$cgi->param('as_of').')' if $
offset > 0
;
+ $
as_of = parse_datetime($cgi->param('as_of')) || ''
;
+ $opt{'title'} .= ' ('.$cgi->param('as_of').')' if $
as_of
;
}
}
-#my $range_cols = join(',', map &{$range_sub}( @$_ ), @ranges );
-
my $range_cols = join(',', map call_range_sub($range_sub, @$_, 'offset' => $offset
), @$ranges );
+my $range_cols = join(',',
+
map call_range_sub($range_sub, @$_, 'as_of' => $as_of
), @$ranges );
my $select_count_pkgs = FS::cust_main->select_count_pkgs_sql;
my $select_count_pkgs = FS::cust_main->select_count_pkgs_sql;
@@
-145,8
+140,12
@@
unless ( $cgi->param('all_customers') ) {
$days = $1;
}
$days = $1;
}
+ # If this is set, allow cust_main records with nonzero balances
+ my $negative = $cgi->param('negative') || 0;
+
push @where,
push @where,
- call_range_sub($range_sub, $days, 0, 'offset' => $offset, 'no_as'=>1). ' > 0'; # != 0';
+ call_range_sub($range_sub, $days, 0, 'as_of' => $as_of, 'no_as'=>1).
+ ($negative ? ' != 0' : ' > 0');
}
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
}
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
@@
-159,10
+158,18
@@
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
#prospect active inactive suspended cancelled
if ( grep { $cgi->param('status') eq $_ } FS::cust_main->statuses() ) {
my $method = $cgi->param('status'). '_sql';
#prospect active inactive suspended cancelled
if ( grep { $cgi->param('status') eq $_ } FS::cust_main->statuses() ) {
my $method = $cgi->param('status'). '_sql';
- #push @where, $class->$method();
push @where, FS::cust_main->$method();
}
push @where, FS::cust_main->$method();
}
+# cust_classnum (false laziness w/prepaid_income.html, elements/cust_pay_or_refund.html, cust_bill_pay.html, cust_bill_pkg.html, cust_bill_pkg_referral.html, unearned_detail.html, cust_credit.html, cust_credit_refund.html, cust_main::Search::search_sql)
+if ( grep { $_ eq 'cust_classnum' } $cgi->param ) {
+ my @classnums = grep /^\d*$/, $cgi->param('cust_classnum');
+ push @where, 'COALESCE( cust_main.classnum, 0) IN ( '.
+ join(',', map { $_ || '0' } @classnums ).
+ ' )'
+ if @classnums;
+}
+
#here is the agent virtualization
push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
#here is the agent virtualization
push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
@@
-173,10
+180,11
@@
my $count_sql = "select count(*) from cust_main $where";
my $sql_query = {
'table' => 'cust_main',
my $sql_query = {
'table' => 'cust_main',
+ 'addl_from' => FS::UI::Web::join_cust_main('cust_main'),
'hashref' => {},
'select' => join(',',
#'cust_main.*',
'hashref' => {},
'select' => join(',',
#'cust_main.*',
- 'custnum',
+ 'cust
_main.cust
num',
$range_cols,
$packages_cols,
FS::UI::Web::cust_sql_fields(),
$range_cols,
$packages_cols,
FS::UI::Web::cust_sql_fields(),
@@
-188,7
+196,9
@@
my $sql_query = {
my $total_sql =
"SELECT ".
my $total_sql =
"SELECT ".
- join(',', map call_range_sub( $range_sub, @$_, 'offset' => $offset, 'sum'=>1 ), @$ranges).
+ join(',',
+ map call_range_sub( $range_sub, @$_, 'as_of' => $as_of, 'sum'=>1 ),
+ @$ranges).
" FROM cust_main $where";
my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
" FROM cust_main $where";
my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
@@
-218,7
+228,7
@@
if($opt{'payment_links'} && $curuser->access_right('Process payment') && @payby)
@pay_labels = (map { my $payby = $_;
my $label = $label{$payby};
@pay_labels = (map { my $payby = $_;
my $label = $label{$payby};
- sub {($payby eq $_[0]->payby) ? "<b>
$label (on file)</b>" : $label
}
+ sub {($payby eq $_[0]->payby) ? "<b>
".emt("$label (on file)")."</b>" : emt($label)
}
} @payby );
@pay_links = (map { [ "${p}misc/payment.cgi?payby=$_;custnum=", 'custnum' ] }
} @payby );
@pay_links = (map { [ "${p}misc/payment.cgi?payby=$_;custnum=", 'custnum' ] }
@@
-253,10
+263,11
@@
sub call_range_sub {
my $as = $opt{'no_as'} ? '' : " AS rangecol_${startdays}_$enddays";
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_of = $opt{'as_of'} || time;
+ my $cutoff = DateTime->from_epoch(epoch => $as_of, time_zone => 'local');
+ $cutoff->truncate(to => 'day'); # local midnight on the report day
+ $cutoff->add(days => 1); # the day after that
+ $cutoff->subtract(seconds => 1); # the last second of the report day
my $start = $cutoff->clone;
$start->subtract(days => $startdays);
my $start = $cutoff->clone;
$start->subtract(days => $startdays);
@@
-264,7
+275,7
@@
sub call_range_sub {
my $end = $cutoff->clone;
$end->subtract(days => $enddays);
my $end = $cutoff->clone;
$end->subtract(days => $enddays);
- #warn "
offset $offset (".$cutoff->epoch.")
, range $startdays-$enddays (".$start->epoch . '-' . ($enddays ? $end->epoch : '').")\n";
+ #warn "
cutoff ".$cutoff->epoch."
, range $startdays-$enddays (".$start->epoch . '-' . ($enddays ? $end->epoch : '').")\n";
my $sql = &{$range_sub}( $start->epoch,
$enddays ? $end->epoch : '',
$cutoff->epoch ); #%opt?
my $sql = &{$range_sub}( $start->epoch,
$enddays ? $end->epoch : '',
$cutoff->epoch ); #%opt?