X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_main.html;h=1aa3390cb9cdfb221380a2dfae5807da13f0b62a;hp=498024ba052a184d63ae4e715be87ed53b18d142;hb=c67eaf049134e6f7ab9fe8d33d043d7d397008f3;hpb=9f97c81b19a3184ea68df32aaea43808b22e10f0 diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html index 498024ba0..1aa3390cb 100755 --- a/httemplate/search/cust_main.html +++ b/httemplate/search/cust_main.html @@ -33,9 +33,7 @@ <%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 = (); @@ -43,20 +41,25 @@ my %search_hash = (); #scalars my @scalars = qw ( - agentnum status address paydate_year paydate_month invoice_terms - no_censustract with_geocode custbatch usernum + agentnum salesnum status + address city county state zip country location_history + invoice_terms + no_censustract with_geocode with_email tax no_tax POST no_POST + custbatch usernum cancelled_pkgs cust_fields flattened_pkgs - refnum + all_tags + all_pkg_classnums + any_pkg_status ); for my $param ( @scalars ) { $search_hash{$param} = scalar( $cgi->param($param) ) - if $cgi->param($param); + if length($cgi->param($param)); } #lists -for my $param (qw( classnum payby tagnum )) { +for my $param (qw( classnum refnum tagnum pkg_classnum )) { $search_hash{$param} = [ $cgi->param($param) ]; } @@ -64,14 +67,22 @@ for my $param (qw( classnum payby tagnum )) { # 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; }