X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_main.html;h=f75b45197547cc86461198d7d02aa6b5648bb631;hb=c1cabbc4cea2e0cfd9e1db668100b97069140cf5;hp=57538d8caf39c1bc659094505549c340e9a647ab;hpb=2bb7bb059897fd50bcc34586cfd1a9a4d257eb91;p=freeside.git diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html index 57538d8ca..f75b45197 100755 --- 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,14 +29,11 @@ ), map '', @extra_fields ], - ) -%> +&> <%init> die "access denied" - unless ( $FS::CurrentUser::CurrentUser->access_right('List customers') && - $FS::CurrentUser::CurrentUser->access_right('List packages') - ); + unless $FS::CurrentUser::CurrentUser->access_right('Advanced customer search'); my %search_hash = (); @@ -45,7 +42,7 @@ my %search_hash = (); #scalars my @scalars = qw ( agentnum status address paydate_year paydate_month invoice_terms - no_censustract custbatch usernum + no_censustract with_geocode custbatch usernum cancelled_pkgs cust_fields flattened_pkgs ); @@ -56,7 +53,7 @@ for my $param ( @scalars ) { } #lists -for my $param (qw( classnum payby )) { +for my $param (qw( classnum refnum payby tagnum )) { $search_hash{$param} = [ $cgi->param($param) ]; } @@ -64,14 +61,22 @@ for my $param (qw( classnum payby )) { # parse dates ### -foreach my $field (qw( signupdate )) { +foreach my $field (qw( signupdate birthdate spouse_birthdate anniversary_date )) { my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field); - next if $beginning == 0 && $ending == 4294967295 && !defined($cgi->param('signuphour')); + next if $beginning == 0 && $ending == 4294967295 && ( $field ne 'signupdate' || !defined($cgi->param('signuphour')) ); #or $disable{$cgi->param('status')}->{$field}; - $search_hash{$field} = [ $beginning, $ending, $cgi->param('signuphour') ]; + unless ( $field eq 'signupdate' ) { + $beginning -= 43200; + $ending -= 43200; + } + + my @ary = ( $beginning, $ending ); + push @ary, scalar($cgi->param('signuphour')) if $field eq 'signupdate'; + + $search_hash{$field} = \@ary; } @@ -105,7 +110,7 @@ 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' => + push @$menubar, emt('Email a notice to these customers') => "${p}misc/email-customers.html?table=cust_main&$query", }