projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lock down manual batch approval
[freeside.git]
/
httemplate
/
search
/
cust_main.html
diff --git
a/httemplate/search/cust_main.html
b/httemplate/search/cust_main.html
index
3282f0f
..
04ecf89
100755
(executable)
--- a/
httemplate/search/cust_main.html
+++ b/
httemplate/search/cust_main.html
@@
-43,17
+43,21
@@
my %search_hash = ();
#$search_hash{'query'} = $cgi->keywords;
#scalars
#$search_hash{'query'} = $cgi->keywords;
#scalars
-for my $param (qw(
- agentnum status cancelled_pkgs cust_fields flattened_pkgs custbatch
-)) {
+my @scalars = qw (
+ 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 ) {
$search_hash{$param} = scalar( $cgi->param($param) )
if $cgi->param($param);
}
#lists
$search_hash{$param} = scalar( $cgi->param($param) )
if $cgi->param($param);
}
#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) ];
}
###
}
###
@@
-64,10
+68,10
@@
foreach my $field (qw( signupdate )) {
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
&& !defined($cgi->param('signuphour'))
;
#or $disable{$cgi->param('status')}->{$field};
#or $disable{$cgi->param('status')}->{$field};
- $search_hash{$field} = [ $beginning, $ending ];
+ $search_hash{$field} = [ $beginning, $ending
, $cgi->param('signuphour')
];
}
}
@@
-82,7
+86,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'}) };
@@
-97,12
+101,12
@@
my $menubar = [];
if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') ) {
if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') ) {
- my $uri = new URI
::URL
;
+ my $uri = new URI;
$uri->query_form( \%search_hash );
my $query = $uri->query;
push @$menubar, 'Email a notice to these customers' =>
$uri->query_form( \%search_hash );
my $query = $uri->query;
push @$menubar, 'Email a notice to these customers' =>
- "${p}misc/email-customers.html?$query",
+ "${p}misc/email-customers.html?
table=cust_main&
$query",
}
}