X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill.html;h=894ddad51de0033916f322e00ed184fe0501cfce;hb=7871134261d6ee6304ea7164966f6058cb3b6400;hp=337e9e859343b2d88d7a4cf1dcfb246fe1663919;hpb=0f5028bc5a7789429a41bca886e5a38ed0fa099f;p=freeside.git

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 337e9e859..894ddad51 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -1,101 +1,196 @@
-<%
-   my( $count_query, $sql_query );
-   if ( $cgi->param('begin') || $cgi->param('end') || $cgi->keywords ) {
-
-     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 )";
-
-     my @where;
-     my $orderby = 'ORDER BY cust_bill._date';
-
-     if ( $cgi->param('begin') =~ /^(\d+)$/ ) {
-       push @where, "cust_bill._date >= $1",
-     }
-     if ( $cgi->param('end') =~ /^(\d+)$/ ) {
-       push @where, "cust_bill._date < $1",
-     }
-
-     my($query) = $cgi->keywords;
-     if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
-       my($open, $days, $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;
-     }
-   
-     my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
-   
-     $count_query = "SELECT COUNT(*), sum(charged), sum($owed)
-                     FROM cust_bill $extra_sql";
-   
-     $sql_query = {
-       'table'     => 'cust_bill',
-       'hashref'   => {},
-       'select'    => "cust_bill.*, $owed as owed",
-       'extra_sql' => "$extra_sql $orderby"
-     };
-   
-   } else {
-     $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
-     $count_query = 'SELECT 1';
-     $sql_query = {
-       'table'     => 'cust_bill',
-       'hashref'   => { 'invnum' => $2 },
-       #'select'    => '*',
-     };
-   }
-
-   my $link  = [ "${p}view/cust_bill.cgi?", 'invnum', ];
-   my $clink = sub {
-     my $cust_bill = shift;
-     my $cust_main = $cust_bill->cust_main;
-     $cust_main
-       ? [ "${p}view/cust_main.cgi?", 'custnum' ]
-       : '';
-   };
-
-%>
-<%= include( 'elements/search.html',
-               'title'       => 'Invoice Search Results',
-               'name'        => 'invoices',
-               'query'       => $sql_query,
-               'count_query' => $count_query,
-               'count_addl'  => [ '$%.2f total invoiced',
-                                  '$%.2f total outstanding balance',
-                                ],
-               'redirect'    => $link,
-               'header'      =>
-                 [ 'Invoice #', qw(Balance Amount Date), 'Contact name',
-                   'Company' ],
-               'fields'      => [
-                 'invnum',
-                 sub { sprintf('$%.2f', shift->get('owed') ) },
-                 sub { sprintf('$%.2f', shift->charged     ) },
-                 sub { time2str('%b %d %Y', shift->_date ) },
-                 sub { my $cust_bill = shift;
-                       my $cust_main = $cust_bill->cust_main;
-                       $cust_main
-                         ? $cust_main->get('last'). ', '. $cust_main->first
-                         : "WARNING: can't find cust_main.custnum ".
-                           $cust_bill->custnum. ' (cust_bill.invnum '.
-                           $cust_bill->invnum. ')';
-                     },
-                 sub { my $cust_main = shift->cust_main;
-                       $cust_main ? $cust_main->company : '';
-                     },
-               ],
-               'links' => [
-                 $link,
-                 $link,
-                 $link,
-                 $link,
-                 $clink,
-                 $clink,
-               ],
-
-    )
+%
+%
+%   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!<FORM NAME="${_}form">!,
+%    qq!<INPUT TYPE="hidden" NAME="begin"     VALUE="$begin">!,
+%    qq!<INPUT TYPE="hidden" NAME="end"       VALUE="$end">!,
+%    qq!<INPUT TYPE="hidden" NAME="agentnum"  VALUE="$agentnum">!,
+%    qq!<INPUT TYPE="hidden" NAME="open"      VALUE="$open">!,
+%    qq!<INPUT TYPE="hidden" NAME="days"      VALUE="$days">!,
+%    qq!</FORM>!
+%  } 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,
+                 'menubar'     => $menubar,
+                 'name'        => 'invoices',
+                 'query'       => $sql_query,
+                 'count_query' => $count_query,
+                 'count_addl'  => $count_addl,
+                 'redirect'    => $link,
+                 'header'      => [ 'Invoice #',
+                                    'Balance',
+                                    'Amount',
+                                    'Date',
+                                    FS::UI::Web::cust_header(),
+                                  ],
+                 'fields'      => [
+                   'invnum',
+                   sub { sprintf($money_char.'%.2f', shift->get('owed') ) },
+                   sub { sprintf($money_char.'%.2f', shift->charged     ) },
+                   sub { time2str('%b %d %Y', shift->_date ) },
+                   \&FS::UI::Web::cust_fields,
+                 ],
+                 'align' => 'rrrrll',
+                 'links' => [
+                   $link,
+                   $link,
+                   $link,
+                   $link,
+                   ( map { $clink } FS::UI::Web::cust_header() ),
+                 ],
+  
+      )
 %>