X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill.html;h=25a7ea05109bd76eadeed15cff6434b9104d98ff;hb=4879d6626e33e0df7d1655cc4ee4ddaff4279218;hp=aa4b2f10899f3ddf5a9e5bccf850c0c569a586b7;hpb=ed722b852f9f24a023bd1f1aa4a16ec39230e22c;p=freeside.git diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html index aa4b2f108..25a7ea051 100755 --- a/httemplate/search/cust_bill.html +++ b/httemplate/search/cust_bill.html @@ -9,13 +9,15 @@ '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, @@ -26,6 +28,7 @@ $link, $link, $link, + $link, ( map { $_ ne 'Cust. Status' ? $clink : '' } FS::UI::Web::cust_header() ), @@ -35,6 +38,7 @@ '', '', '', + '', FS::UI::Web::cust_colors(), ], 'style' => [ @@ -42,6 +46,7 @@ '', '', '', + '', FS::UI::Web::cust_styles(), ], @@ -59,13 +64,11 @@ 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) = ( '', '' ); -my($invnum_min, $invnum_max) = ( '', '' ); -my $newest_percust = ''; +#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 @@ -76,12 +79,8 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) { #'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; @@ -89,74 +88,60 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) { if ( $cgi->param('beginning') && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) { - $begin = str2time($1); - push @where, "cust_bill._date >= $begin"; + $search{'begin'} = str2time($1); } if ( $cgi->param('ending') && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) { - $end = str2time($1) + 86399; - push @where, "cust_bill._date < $end"; + $search{'end'} = str2time($1) + 86399; } if ( $cgi->param('begin') =~ /^(\d+)$/ ) { - $begin = $1; - push @where, "cust_bill._date >= $begin"; + $search{'begin'} = $1; } if ( $cgi->param('end') =~ /^(\d+)$/ ) { - $end = $1; - push @where, "cust_bill._date < $end"; + $search{'end'} = $1; } if ( $cgi->param('invnum_min') =~ /^\s*(\d+)\s*$/ ) { - $invnum_min = $1; - push @where, "cust_bill.invnum >= $1"; + $search{'invnum_min'} = $1; } if ( $cgi->param('invnum_max') =~ /^\s*(\d+)\s*$/ ) { - $invnum_max = $1; - push @where, "cust_bill.invnum <= $1"; + $search{'invnum_max'} = $1; } if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { - $agentnum = $1; - push @where, "cust_main.agentnum = $agentnum"; + $search{'agentnum'} = $1; } - 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; - } + $search{'open'} = 1 if $cgi->param('open'); + $search{'net'} = 1 if $cgi->param('net' ); my($query) = $cgi->keywords; if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) { - ($open, $days, my $field) = ($1, $2, $3); + $search{'open'} = 1 if $1; + ($search{'days'}, my $field) = ($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') ) { - $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 + $search{'newest_percust'} = 1; $count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'"; } + my $extra_sql = ' WHERE '. FS::cust_bill->search_sql( \%search ); + unless ( $count_query ) { - $count_query = "SELECT COUNT(*), sum(charged), sum($owed)"; - $count_addl = [ '$%.2f total invoiced', - '$%.2f total outstanding balance', + $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"; @@ -165,14 +150,17 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) { 'table' => 'cust_bill', 'addl_from' => $join_cust_main, 'hashref' => {}, - 'select' => "$distinct ". join(', ', + #'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(), - "$owed as owed", + FS::cust_bill->owed_sql. ' AS owed', + FS::cust_bill->net_sql. ' AS net', ), - 'extra_sql' => "$extra_sql $orderby" + 'extra_sql' => $extra_sql, + 'order_by' => $orderby, }; } @@ -192,22 +180,13 @@ my $html_init = join("\n", map { ( my $action = $_ ) =~ s/_$//; include('/elements/progress-init.html', $_.'form', - [ 'begin', 'end', 'agentnum', 'open', 'days', - 'invnum_min', 'invnum_max', 'newest_percust', - ], + [ keys %search ], "../misc/${_}invoices.cgi", { 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but... $_, #key ), qq!
!, - qq!!, - qq!!, - qq!!, - qq!!, - qq!!, - qq!!, - qq!!, - qq!!, + ( map qq!!, keys %search ), qq!
! } qw( print_ email_ fax_ ) ). @@ -235,7 +214,6 @@ function confirm_fax_process() { '; my $menubar = [ - 'Main menu' => $p, 'Print these invoices' => "javascript:confirm_print_process()", 'Email these invoices' =>