projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
search
/
cust_main.html
diff --git
a/httemplate/search/cust_main.html
b/httemplate/search/cust_main.html
index
bb5eae7
..
c897879
100755
(executable)
--- a/
httemplate/search/cust_main.html
+++ b/
httemplate/search/cust_main.html
@@
-27,15
+27,17
@@
$cgi->param('cust_fields')
)
),
$cgi->param('cust_fields')
)
),
- map '', @extra_fields
+ map { $_ eq 'num_referrals'
+ ? $referral_link
+ : ''
+ }
+ @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 = ();
@@
-43,28
+45,41
@@
my %search_hash = ();
#scalars
my @scalars = qw (
#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
cancelled_pkgs
cust_fields flattened_pkgs
- refnum
+ all_tags
+ all_pkg_classnums
+ any_pkg_status
+ with_referrals referral_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 tag
num )) {
+for my $param (qw( classnum
refnum pkg_class
num )) {
$search_hash{$param} = [ $cgi->param($param) ];
}
$search_hash{$param} = [ $cgi->param($param) ];
}
+#tags
+my $params = $cgi->Vars;
+$search_hash{'tagnum'} = [
+ map { /^tagnum(\d+)/ && $1 }
+ grep { /^tagnum(\d+)/ && $cgi->param($_) } keys %$params
+];
+
###
# parse dates
###
###
# parse dates
###
-foreach my $field (qw( signupdate birthdate spouse_birthdate )) {
+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);
@@
-101,6
+116,8
@@
my @extra_fields = @{ delete($sql_query->{'extra_fields'}) };
my $link = [ "${p}view/cust_main.cgi?", 'custnum' ];
my $link = [ "${p}view/cust_main.cgi?", 'custnum' ];
+my $referral_link = [ "${p}search/cust_main.cgi?referral_custnum=", 'custnum' ];
+
###
# email links
###
###
# email links
###