projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
when searching locaitons, don't search historic locations by default, RT#73412
[freeside.git]
/
httemplate
/
search
/
cust_main.html
diff --git
a/httemplate/search/cust_main.html
b/httemplate/search/cust_main.html
index
186467e
..
1aa3390
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,
'menubar' => $menubar,
- 'name' =>
'customers'
,
+ 'name' =>
emt('customers')
,
'query' => $sql_query,
'count_query' => $count_query,
'header' => [ FS::UI::Web::cust_header(
'query' => $sql_query,
'count_query' => $count_query,
'header' => [ FS::UI::Web::cust_header(
@@
-29,14
+29,11
@@
),
map '', @extra_fields
],
),
map '', @extra_fields
],
- )
-%>
+&>
<%init>
die "access denied"
<%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 = ();
my %search_hash = ();
@@
-44,17
+41,25
@@
my %search_hash = ();
#scalars
my @scalars = qw (
#scalars
my @scalars = qw (
- agentnum status cancelled_pkgs cust_fields flattened_pkgs custbatch
- no_censustract
+ 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
+ all_tags
+ all_pkg_classnums
+ any_pkg_status
);
for my $param ( @scalars ) {
$search_hash{$param} = scalar( $cgi->param($param) )
);
for my $param ( @scalars ) {
$search_hash{$param} = scalar( $cgi->param($param) )
- if
$cgi->param($param
);
+ if
length($cgi->param($param)
);
}
#lists
}
#lists
-for my $param (qw( classnum
payby
)) {
+for my $param (qw( classnum
refnum tagnum pkg_classnum
)) {
$search_hash{$param} = [ $cgi->param($param) ];
}
$search_hash{$param} = [ $cgi->param($param) ];
}
@@
-62,14
+67,22
@@
for my $param (qw( classnum payby )) {
# parse dates
###
# 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);
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
- next if $beginning == 0 && $ending == 4294967295;
+ next if $beginning == 0 && $ending == 4294967295
&& ( $field ne 'signupdate' || !defined($cgi->param('signuphour')) )
;
#or $disable{$cgi->param('status')}->{$field};
#or $disable{$cgi->param('status')}->{$field};
- $search_hash{$field} = [ $beginning, $ending ];
+ 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;
}
}
@@
-84,7
+97,7
@@
$search_hash{'current_balance'} =
# etc
###
# 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'}) };
my $count_query = delete($sql_query->{'count_query'});
my @extra_headers = @{ delete($sql_query->{'extra_headers'}) };
my @extra_fields = @{ delete($sql_query->{'extra_fields'}) };
@@
-103,8
+116,8
@@
if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') )
$uri->query_form( \%search_hash );
my $query = $uri->query;
$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",
}
}