improve speed in customer search, #13364

[freeside.git] / httemplate / search / cust_main.html

diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index f098fd3..693996e 100755 (executable)
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -1,7 +1,7 @@
-<% include( 'elements/search.html',
-                  'title'       => 'Customer Search Results', 
+<& elements/search.html,
+                  'title'       => emt('Customer Search Results'), 
                   'menubar'     => $menubar,
-                  'name'        => 'customers',
+                  'name'        => emt('customers'),
                   'query'       => $sql_query,
                   'count_query' => $count_query,
                   'header'      => [ FS::UI::Web::cust_header(
@@ -29,8 +29,7 @@
                                      ),
                                      map '', @extra_fields
                                    ],
-              )
-%>
+&>
 <%init>
 
 die "access denied"
@@ -44,8 +43,10 @@ my %search_hash = ();
 
 #scalars
 my @scalars = qw (
-  agentnum status cancelled_pkgs cust_fields flattened_pkgs custbatch
-  no_censustract
+  agentnum status address paydate_year paydate_month invoice_terms
+  no_censustract with_geocode custbatch usernum
+  cancelled_pkgs
+  cust_fields flattened_pkgs
 );
 
 for my $param ( @scalars ) {
@@ -54,9 +55,8 @@ for my $param ( @scalars ) {
 }
 
 #lists
-for my $param (qw( payby )) {
-  $search_hash{$param} = [ $cgi->param($param) ]
-    if $cgi->param($param);
+for my $param (qw( classnum payby tagnum )) {
+  $search_hash{$param} = [ $cgi->param($param) ];
 }
 
 ###
@@ -67,10 +67,10 @@ foreach my $field (qw( signupdate )) {
 
   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
 
-  next if $beginning == 0 && $ending == 4294967295;
+  next if $beginning == 0 && $ending == 4294967295 && !defined($cgi->param('signuphour'));
        #or $disable{$cgi->param('status')}->{$field};
 
-  $search_hash{$field} = [ $beginning, $ending ];
+  $search_hash{$field} = [ $beginning, $ending, $cgi->param('signuphour') ];
 
 }
 
@@ -85,7 +85,7 @@ $search_hash{'current_balance'} =
 # etc
 ###
 
-my $sql_query = FS::cust_main->search_sql(\%search_hash);
+my $sql_query = FS::cust_main::Search->search(\%search_hash);
 my $count_query   = delete($sql_query->{'count_query'});
 my @extra_headers = @{ delete($sql_query->{'extra_headers'}) };
 my @extra_fields  = @{ delete($sql_query->{'extra_fields'})  };
@@ -104,8 +104,8 @@ if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') )
   $uri->query_form( \%search_hash );
   my $query = $uri->query;
 
-  push @$menubar, 'Email a notice to these customers' =>
-                    "${p}misc/email-customers.html?$query",
+  push @$menubar, emt('Email a notice to these customers') =>
+                    "${p}misc/email-customers.html?table=cust_main&$query",
 
 }