X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill.html;h=813f9b843ca7ffa9690a1bdc61ae5a572c6b974b;hb=ea3ce8d7f076e7fecff4be7ae63bc413adb0adf5;hp=69384b81342f964fefe16238c6690848b75b9bb7;hpb=45c73e0d548b950dd29c21d863c239f6114a2083;p=freeside.git

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 69384b813..813f9b843 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -1,5 +1,5 @@
-<% include( 'elements/search.html',
-                 'title'       => 'Invoice Search Results',
+<& elements/search.html,
+                 'title'       => emt('Invoice Search Results'),
                  'html_init'   => $html_init,
                  'menubar'     => $menubar,
                  'name'        => 'invoices',
@@ -7,22 +7,29 @@
                  'count_query' => $count_query,
                  'count_addl'  => $count_addl,
                  'redirect'    => $link,
-                 'header'      => [ 'Invoice #',
-                                    'Balance',
-                                    'Net Amount',
-                                    'Gross Amount',
-                                    'Date',
+                 'header'      => [ emt('Invoice #'),
+                                    emt('Balance'),
+                                    emt('Net Amount'),
+                                    emt('Gross Amount'),
+                                    emt('Date'),
                                     FS::UI::Web::cust_header(),
                                   ],
                  'fields'      => [
-                   'invnum',
+                   'display_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' => 'rrrr'.FS::UI::Web::cust_aligns(),
+                 'sort_fields' => [
+                   'COALESCE( agent_invid, invnum )',
+                   FS::cust_bill->owed_sql,
+                   FS::cust_bill->net_sql,
+                   'charged',
+                   '_date',
+                 ],
+                 'align' => 'rrrrl'.FS::UI::Web::cust_aligns(),
                  'links' => [
                    $link,
                    $link,
@@ -49,10 +56,7 @@
                               '',
                               FS::UI::Web::cust_styles(),
                             ],
-
-  
-      )
-%>
+&>
 <%init>
 
 die "access denied"
@@ -64,44 +68,40 @@ 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
+  my $invnum_or_invid = "( invnum = $2 OR agent_invid = $2 )";
+  my $where = "WHERE $invnum_or_invid AND $agentnums_sql";
+  
+  $count_query = "SELECT COUNT(*) FROM cust_bill $join_cust_main $where";
+
   $sql_query = {
     'table'     => 'cust_bill',
     'addl_from' => $join_cust_main,
-    'hashref'   => { 'invnum' => $2 },
-    #'select'    => '*',
-    'extra_sql' => " AND $agentnums_sql", #agent virtualization
+    'hashref'   => {},
+    'extra_sql' => $where,
   };
 
 } 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);
-  }
-  if ( $cgi->param('ending')
-        && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    $search{'end'} = str2time($1) + 86399;
+  if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+    $search{'agentnum'} = $1;
   }
 
-  if ( $cgi->param('begin') =~ /^(\d+)$/ ) {
-    $search{'begin'} = $1;
-  }
-  if ( $cgi->param('end') =~ /^(\d+)$/ ) {
-    $search{'end'} = $1;
+  if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+    $search{'custnum'} = $1;
   }
 
+  # begin/end/beginning/ending
+  my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '');
+  $search{'_date'} = [ $beginning, $ending ]
+    unless $beginning == 0 && $ending == 4294967295;
+
   if ( $cgi->param('invnum_min') =~ /^\s*(\d+)\s*$/ ) {
     $search{'invnum_min'} = $1;
   }
@@ -109,9 +109,9 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
     $search{'invnum_max'} = $1;
   }
 
-  if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-    $search{'agentnum'} = $1;
-  }
+  #amounts
+  $search{$_} = [ FS::UI::Web::parse_lt_gt($cgi, $_) ]
+    foreach qw( charged owed );
 
   $search{'open'} = 1 if $cgi->param('open');
   $search{'net'}  = 1 if $cgi->param('net' );
@@ -129,7 +129,34 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
     $count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'";
   }
 
-  my $extra_sql = ' WHERE '. FS::cust_bill->search_sql( \%search );
+  # promised date
+  my $start_of_day = timelocal(0, 0, 0, (localtime(time))[3,4,5]);
+  foreach ( $cgi->param('promised_date') ) {
+    # only if at least one box is checked
+    $search{promised_date} ||= [ $start_of_day, $start_of_day, 0 ];
+    if ($_ eq 'past') {
+      # accept everything before today
+      $search{promised_date}[0] = 0;
+    }
+    elsif ( $_ eq 'future' ) {
+      # accept everything after today
+      $search{promised_date}[1] = 4294967295;
+    }
+    elsif ( $_ eq 'null' ) {
+      # accept nulls
+      $search{promised_date}[2] = 1;
+    }
+  }
+
+  my $payby_sql = '';
+  $payby_sql = ' AND (' . 
+    join(' OR ', map { "cust_main.payby = '$_'" } $cgi->param('payby') ) . 
+    ')' 
+    if $cgi->param('payby');
+
+  my $extra_sql = ' WHERE '.
+    FS::cust_bill->search_sql_where( \%search ).
+    $payby_sql;
 
   unless ( $count_query ) {
     $count_query = 'SELECT COUNT(*), '. join(', ',
@@ -150,7 +177,6 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
     'table'     => 'cust_bill',
     'addl_from' => $join_cust_main,
     'hashref'   => {},
-    #'select'    => "$distinct ". join(', ',
     'select'    => join(', ',
                      'cust_bill.*',
                      #( map "cust_main.$_", qw(custnum last first company) ),
@@ -159,7 +185,8 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
                      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,
   };
 
 }
@@ -185,43 +212,71 @@ my $html_init = join("\n", map {
            $_, #key
         ),
  qq!<FORM NAME="${_}form">!,
- ( map qq!<INPUT TYPE="hidden" NAME="$_" VALUE="$search{$_}">!, keys %search ),
+ ( map { my $f = $_;
+         my @values = ref($search{$f}) ? @{ $search{$f} } : $search{$f};
+         map qq!<INPUT TYPE="hidden" NAME="$f" VALUE="$_">!, @values;
+       }
+       keys %search
+ ),
  qq!</FORM>!
-} qw( print_ email_ fax_ ) ). 
+} qw( print_ email_ fax_ ftp_ spool_ ) ). 
 
 '<SCRIPT TYPE="text/javascript">
 
 function confirm_print_process() {
-  if ( ! confirm("Are you sure you want to reprint these invoices?") ) {
+  if ( ! confirm('.js_mt("Are you sure you want to reprint these invoices?").') ) {
     return;
   }
   print_process();
 }
 function confirm_email_process() {
-  if ( ! confirm("Are you sure you want to re-email these invoices?") ) {
+  if ( ! confirm('.js_mt("Are you sure you want to re-email these invoices?").') ) {
     return;
   }
   email_process();
 }
 function confirm_fax_process() {
-  if ( ! confirm("Are you sure you want to re-fax these invoices?") ) {
+  if ( ! confirm('.js_mt("Are you sure you want to re-fax these invoices?").') ) {
     return;
   }
   fax_process();
 }
+function confirm_ftp_process() {
+  if ( ! confirm('.js_mt("Are you sure you want to re-FTP these invoices?").') ) {
+    return;
+  }
+  ftp_process();
+}
+function confirm_spool_process() {
+  if ( ! confirm('.js_mt("Are you sure you want to re-spool these invoices?").') ) {
+    return;
+  }
+  spool_process();
+}
 
 </SCRIPT>';
 
-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');
+my $menubar = [];
+
+if ( $FS::CurrentUser::CurrentUser->access_right('Resend invoices') ) {
+
+  push @$menubar, emt('Print these invoices') =>
+                    "javascript:confirm_print_process()",
+                  emt('Email these invoices') =>
+                    "javascript:confirm_email_process()";
+
+  push @$menubar, emt('Fax these invoices') =>
+                    "javascript:confirm_fax_process()"
+    if $conf->exists('hylafax');
+
+  push @$menubar, emt('FTP these invoices') =>
+                    "javascript:confirm_ftp_process()"
+    if $conf->exists('cust_bill-ftpformat');
+
+  push @$menubar, emt('Spool these invoices') =>
+                    "javascript:confirm_spool_process()"
+    if $conf->exists('cust_bill-spoolformat');
+
+}
 
 </%init>