X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill.html;h=9589efd02fd6e916f1055aaccbdf3deae0b73833;hb=1f8e84ae7baed672430fd6ba261f7e58e0424a99;hp=894ddad51de0033916f322e00ed184fe0501cfce;hpb=c8cccb4a92adceb943c635fe62dad0d034462ce0;p=freeside.git
diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 894ddad51..9589efd02 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -1,166 +1,3 @@
-%
-%
-% my $join_cust_main = 'LEFT JOIN cust_main USING ( custnum )';
-% #here is the agent virtualization
-% my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
-%
-% my( $count_query, $sql_query );
-% my( $count_addl ) = ( '' );
-% my( $distinct ) = ( '' );
-% my($begin, $end) = ( '', '' );
-% my($agentnum) = ( '' );
-% my($open, $days) = ( '', '' );
-% if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
-% $count_query =
-% "SELECT COUNT(*) FROM cust_bill $join_cust_main".
-% " WHERE invnum = $2 AND $agentnums_sql"; #agent virtualization
-% $sql_query = {
-% 'table' => 'cust_bill',
-% 'addl_from' => $join_cust_main,
-% 'hashref' => { 'invnum' => $2 },
-% #'select' => '*',
-% 'extra_sql' => " AND $agentnums_sql", #agent virtualization
-% };
-% } else {
-% #if ( $cgi->param('begin') || $cgi->param('end')
-% # || $cgi->param('beginning') || $cgi->param('ending')
-% # || $cgi->keywords
-% # )
-% #{
-%
-% #some false laziness w/cust_bill::re_X
-% my @where;
-% my $orderby = 'ORDER BY cust_bill._date';
-%
-% if ( $cgi->param('beginning')
-% && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-% $begin = str2time($1);
-% push @where, "cust_bill._date >= $begin";
-% }
-% if ( $cgi->param('ending')
-% && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-% $end = str2time($1) + 86399;
-% push @where, "cust_bill._date < $end";
-% }
-%
-% if ( $cgi->param('begin') =~ /^(\d+)$/ ) {
-% $begin = $1;
-% push @where, "cust_bill._date >= $begin";
-% }
-% if ( $cgi->param('end') =~ /^(\d+)$/ ) {
-% $end = $1;
-% push @where, "cust_bill._date < $end";
-% }
-%
-% if ( $cgi->param('invnum_min') =~ /^\s*(\d+)\s*$/ ) {
-% push @where, "cust_bill.invnum >= $1";
-% }
-% if ( $cgi->param('invnum_max') =~ /^\s*(\d+)\s*$/ ) {
-% push @where, "cust_bill.invnum <= $1";
-% }
-%
-% if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-% $agentnum = $1;
-% push @where, "cust_main.agentnum = $agentnum";
-% }
-%
-% my $owed =
-% "charged - ( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay
-% WHERE cust_bill_pay.invnum = cust_bill.invnum )
-% - ( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill
-% WHERE cust_credit_bill.invnum = cust_bill.invnum )";
-%
-% if ( $cgi->param('open') ) {
-% push @where, "0 != $owed";
-% $open = 1;
-% }
-%
-% my($query) = $cgi->keywords;
-% if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
-% ($open, $days, my $field) = ($1, $2, $3);
-% $field = "_date" if $field eq 'date';
-% $orderby = "ORDER BY cust_bill.$field";
-% push @where, "0 != $owed" if $open;
-% push @where, "cust_bill._date < ". (time-86400*$days) if $days;
-% }
-%
-% #here is the agent virtualization
-% push @where, $agentnums_sql;
-% my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
-%
-% if ( $cgi->param('newest_percust') ) {
-% $distinct = 'DISTINCT ON ( cust_bill.custnum )';
-% $orderby = 'ORDER BY cust_bill.custnum ASC, cust_bill._date DESC';
-% #$count_query = "SELECT 'N/A', 'N/A', 'N/A'"; #XXXXXXX fix
-% $count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'";
-% }
-%
-% unless ( $count_query ) {
-% $count_query = "SELECT COUNT(*), sum(charged), sum($owed)";
-% $count_addl = [ '$%.2f total invoiced',
-% '$%.2f total outstanding balance',
-% ];
-% }
-% $count_query .= " FROM cust_bill $join_cust_main $extra_sql";
-%
-% $sql_query = {
-% 'table' => 'cust_bill',
-% 'addl_from' => $join_cust_main,
-% 'hashref' => {},
-% 'select' => "$distinct ". join(', ',
-% 'cust_bill.*',
-% #( map "cust_main.$_", qw(custnum last first company) ),
-% 'cust_main.custnum as cust_main_custnum',
-% FS::UI::Web::cust_sql_fields(),
-% "$owed as owed",
-% ),
-% 'extra_sql' => "$extra_sql $orderby"
-% };
-%
-% }
-%
-% my $link = [ "${p}view/cust_bill.cgi?", 'invnum', ];
-% my $clink = sub {
-% my $cust_bill = shift;
-% $cust_bill->cust_main_custnum
-% ? [ "${p}view/cust_main.cgi?", 'custnum' ]
-% : '';
-% };
-%
-% my $conf = new FS::Conf;
-% my $money_char = $conf->config('money_char') || '$';
-%
-% my $html_init = join("\n", map {
-% ( my $action = $_ ) =~ s/_$//;
-% include('/elements/progress-init.html',
-% $_.'form',
-% [ 'begin', 'end', 'agentnum', 'open', 'days', 'newest_percust' ],
-% "../misc/${_}invoices.cgi",
-% { 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but...
-% $_, #key
-% ),
-% qq!!
-% } qw( print_ email_ fax_ ) );
-%
-% my $menubar = [
-% 'Main menu' => $p,
-% 'Print these invoices' =>
-% "javascript:print_process()",
-% 'Email these invoices' =>
-% "javascript:email_process()",
-% ];
-%
-% push @$menubar, 'Fax these invoices' =>
-% "javascript:fax_process()"
-% if $conf->exists('hylafax');
-%
-%
<% include( 'elements/search.html',
'title' => 'Invoice Search Results',
'html_init' => $html_init,
@@ -172,25 +9,259 @@
'redirect' => $link,
'header' => [ 'Invoice #',
'Balance',
- 'Amount',
+ 'Net Amount',
+ 'Gross Amount',
'Date',
FS::UI::Web::cust_header(),
],
'fields' => [
'invnum',
sub { sprintf($money_char.'%.2f', shift->get('owed') ) },
+ sub { sprintf($money_char.'%.2f', shift->get('net') ) },
sub { sprintf($money_char.'%.2f', shift->charged ) },
sub { time2str('%b %d %Y', shift->_date ) },
\&FS::UI::Web::cust_fields,
],
- 'align' => 'rrrrll',
+ 'align' => 'rrrr'.FS::UI::Web::cust_aligns(),
'links' => [
$link,
$link,
$link,
$link,
- ( map { $clink } FS::UI::Web::cust_header() ),
+ $link,
+ ( map { $_ ne 'Cust. Status' ? $clink : '' }
+ FS::UI::Web::cust_header()
+ ),
],
+ 'color' => [
+ '',
+ '',
+ '',
+ '',
+ '',
+ FS::UI::Web::cust_colors(),
+ ],
+ 'style' => [
+ '',
+ '',
+ '',
+ '',
+ '',
+ FS::UI::Web::cust_styles(),
+ ],
+
)
%>
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('List invoices');
+
+my $join_cust_main = 'LEFT JOIN cust_main USING ( custnum )';
+#here is the agent virtualization
+my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+my( $count_query, $sql_query );
+my $count_addl = '';
+#my $distinct = '';
+my %search;
+
+if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
+
+ $count_query =
+ "SELECT COUNT(*) FROM cust_bill $join_cust_main".
+ " WHERE invnum = $2 AND $agentnums_sql"; #agent virtualization
+ $sql_query = {
+ 'table' => 'cust_bill',
+ 'addl_from' => $join_cust_main,
+ 'hashref' => { 'invnum' => $2 },
+ #'select' => '*',
+ 'extra_sql' => " AND $agentnums_sql", #agent virtualization
+ };
+
+} else {
+
+ #some false laziness w/cust_bill::re_X
+ my @where;
+ my $orderby = 'ORDER BY cust_bill._date';
+
+ if ( $cgi->param('beginning')
+ && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+ $search{'begin'} = str2time($1);
+ push @where, 'cust_bill._date >= '. $search{'begin'};
+ }
+ if ( $cgi->param('ending')
+ && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+ $search{'end'} = str2time($1) + 86399;
+ push @where, 'cust_bill._date < '. $search{'end'};
+ }
+
+ if ( $cgi->param('begin') =~ /^(\d+)$/ ) {
+ $search{'begin'} = $1;
+ push @where, 'cust_bill._date >= '. $search{'begin'};
+ }
+ if ( $cgi->param('end') =~ /^(\d+)$/ ) {
+ $search{'end'} = $1;
+ push @where, 'cust_bill._date < '. $search{'end'};
+ }
+
+ if ( $cgi->param('invnum_min') =~ /^\s*(\d+)\s*$/ ) {
+ $search{'invnum_min'} = $1;
+ push @where, 'cust_bill.invnum >= '. $search{'invnum_min'};
+ }
+ if ( $cgi->param('invnum_max') =~ /^\s*(\d+)\s*$/ ) {
+ $search{'invnum_max'} = $1;
+ push @where, 'cust_bill.invnum <= '. $search{'invnum_max'};
+ }
+
+ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+ $search{'agentnum'} = $1;
+ push @where, 'cust_main.agentnum = '. $search{'agentnum'};
+ }
+
+ if ( $cgi->param('open') ) {
+ push @where, '0 != '. FS::cust_bill->owed_sql;
+ $search{'open'} = 1;
+ }
+
+ if ( $cgi->param('net') ) {
+ push @where, '0 != '. FS::cust_bill->net_sql;
+ $search{'net'} = 1;
+ }
+
+ my($query) = $cgi->keywords;
+ if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
+ ($search{'open'}, $search{'days'}, my $field) = ($1, $2, $3);
+ $field = "_date" if $field eq 'date';
+ $orderby = "ORDER BY cust_bill.$field";
+ push @where, '0 != '. FS::cust_bill->owed_sql if $search{'open'};
+ push @where, "cust_bill._date < ". (time-86400*$search{'days'})
+ if $search{'days'};
+ }
+
+ if ( $cgi->param('newest_percust') ) {
+ $search{'newest_percust'} = 1;
+
+ #$distinct = 'DISTINCT ON ( cust_bill.custnum )';
+ #$orderby = 'ORDER BY cust_bill.custnum ASC, cust_bill._date DESC';
+ #$count_query = "SELECT 'N/A', 'N/A', 'N/A'"; #XXXXXXX fix
+
+ my @newest_where = map { my $x = $_;
+ $x =~ s/\bcust_bill\./newest_cust_bill./g;
+ $x;
+ }
+ grep ! /^cust_main./, @where;
+ my $newest_where = scalar(@newest_where)
+ ? ' AND '. join(' AND ', @newest_where)
+ : '';
+
+ push @where, "cust_bill._date = (
+ SELECT(MAX(newest_cust_bill._date)) FROM cust_bill AS newest_cust_bill
+ WHERE newest_cust_bill.custnum = cust_bill.custnum
+ $newest_where
+ )";
+
+
+ $count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'";
+ }
+
+ #here is the agent virtualization
+ push @where, $agentnums_sql;
+
+ my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
+
+ unless ( $count_query ) {
+ $count_query = 'SELECT COUNT(*), '. join(', ',
+ map "SUM($_)",
+ ( 'charged',
+ FS::cust_bill->net_sql,
+ FS::cust_bill->owed_sql,
+ )
+ );
+ $count_addl = [ '$%.2f invoiced (gross)',
+ '$%.2f invoiced (net)',
+ '$%.2f outstanding balance',
+ ];
+ }
+ $count_query .= " FROM cust_bill $join_cust_main $extra_sql";
+
+ $sql_query = {
+ 'table' => 'cust_bill',
+ 'addl_from' => $join_cust_main,
+ 'hashref' => {},
+ #'select' => "$distinct ". join(', ',
+ 'select' => join(', ',
+ 'cust_bill.*',
+ #( map "cust_main.$_", qw(custnum last first company) ),
+ 'cust_main.custnum as cust_main_custnum',
+ FS::UI::Web::cust_sql_fields(),
+ FS::cust_bill->owed_sql. ' AS owed',
+ FS::cust_bill->net_sql. ' AS net',
+ ),
+ 'extra_sql' => "$extra_sql $orderby"
+ };
+
+}
+
+my $link = [ "${p}view/cust_bill.cgi?", 'invnum', ];
+my $clink = sub {
+ my $cust_bill = shift;
+ $cust_bill->cust_main_custnum
+ ? [ "${p}view/cust_main.cgi?", 'custnum' ]
+ : '';
+};
+
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
+my $html_init = join("\n", map {
+ ( my $action = $_ ) =~ s/_$//;
+ include('/elements/progress-init.html',
+ $_.'form',
+ [ keys %search ],
+ "../misc/${_}invoices.cgi",
+ { 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but...
+ $_, #key
+ ),
+ qq!!
+} qw( print_ email_ fax_ ) ).
+
+'';
+
+my $menubar = [
+ 'Main menu' => $p,
+ 'Print these invoices' =>
+ "javascript:confirm_print_process()",
+ 'Email these invoices' =>
+ "javascript:confirm_email_process()",
+ ];
+
+push @$menubar, 'Fax these invoices' =>
+ "javascript:confirm_fax_process()"
+ if $conf->exists('hylafax');
+
+