X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill.html;h=bd302c64f3ed81f7be0a5a0eb4582b4109f9a48d;hb=c647059d0f8490b89e10a7a4ba8e3f7e1c42994b;hp=4f73aaf842fa1a76c352748cf8de5f05c52ccdf4;hpb=6e39b5fce608de6c2fa532439b58e83c548814c9;p=freeside.git

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 4f73aaf84..bd302c64f 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -62,16 +62,16 @@
 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 %search;
+my %search = ();
 
 if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
 
+  my $join_cust_main = FS::UI::Web::join_cust_main('cust_bill');
+  #here is the agent virtualization
+  my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
+
   my $invnum_or_invid = "( invnum = $2 OR agent_invid = $2 )";
   my $where = "WHERE $invnum_or_invid AND $agentnums_sql";
   
@@ -84,87 +84,76 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
     'extra_sql' => $where,
   };
 
-} else {
+  if ( FS::Record->scalar_sql($count_query) == 0 ) {
+
+    # check for a voided invoice
+    $count_query =~ s/cust_bill/cust_bill_void/g;
+    if ( FS::Record->scalar_sql($count_query) > 0 ) {
+      # Redirect to the void search.
+      my $url = $cgi->self_url;
+      $url =~ s(search/cust_bill)(search/cust_bill_void);
+      $m->clear_buffer;
+      $m->print($cgi->redirect($url));
+      $m->abort;
+    }
+  }
 
-  #some false laziness w/cust_bill::re_X
-  my $orderby = 'ORDER BY cust_bill._date';
+} else {
 
-  if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-    $search{'agentnum'} = $1;
+  #deal with some old-style URLs
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
+    $search{'open'} = 1 if $1;
+    ($search{'days'}, my $field) = ($2, $3);
+    $field = "_date" if $field eq 'date';
+    $search{'order_by'} = "cust_bill.$field";
   }
 
-  # begin/end/beginning/ending
-  my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '');
-  $search{'_date'} = [ $beginning, $ending ]
-    unless $beginning == 0 && $ending == 4294967295;
+  #scalars
+  for (qw( agentnum custnum cust_status refnum invnum_min invnum_max
+           open net newest_percust 
 
-  if ( $cgi->param('invnum_min') =~ /^\s*(\d+)\s*$/ ) {
-    $search{'invnum_min'} = $1;
+      )) 
+  {
+    $search{$_} = $cgi->param($_) if length($cgi->param($_));
   }
-  if ( $cgi->param('invnum_max') =~ /^\s*(\d+)\s*$/ ) {
-    $search{'invnum_max'} = $1;
+
+  #arrays
+  for my $param (qw( cust_classnum payby )) {
+  $search{$param} = [ $cgi->param($param) ]
+    if grep { $_ eq $param } $cgi->param;
   }
 
-  #amounts
+  #amounts (range)
   $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' );
-
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
-    $search{'open'} = 1 if $1;
-    ($search{'days'}, my $field) = ($2, $3);
-    $field = "_date" if $field eq 'date';
-    $orderby = "ORDER BY cust_bill.$field";
-  }
+  my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '');
+  $search{'_date'} = [ $beginning, $ending ]
+    unless $beginning == 0 && $ending == 4294967295;
 
-  if ( $cgi->param('newest_percust') ) {
-    $search{'newest_percust'} = 1;
-    $count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'";
+  # 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(', ',
-                     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'    => 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,
-    'order_by'  => $orderby,
-  };
+  $sql_query   = FS::cust_bill->search(\%search);
+  $count_query = delete( $sql_query->{'count_query'} );
+  $count_addl  = delete( $sql_query->{'count_addl'}  );
 
 }
 
@@ -201,31 +190,31 @@ my $html_init = join("\n", map {
 '<SCRIPT TYPE="text/javascript">
 
 function confirm_print_process() {
-  if ( ! confirm('.emt("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('.emt("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('.emt("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('.emt("Are you sure you want to re-FTP these invoices?").') ) {
+  if ( ! confirm('.js_mt("Are you sure you want to re-FTP these invoices?").') ) {
     return;
   }
   ftp_process();
 }
 function confirm_spool_process() {
-  if ( ! confirm('.emt("Are you sure you want to re-spool these invoices?").') ) {
+  if ( ! confirm('.js_mt("Are you sure you want to re-spool these invoices?").') ) {
     return;
   }
   spool_process();