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
b0ce31a
..
0a43a82
100755
(executable)
--- a/
httemplate/search/cust_main.html
+++ b/
httemplate/search/cust_main.html
@@
-13,6
+13,10
@@
\&FS::UI::Web::cust_fields,
@extra_fields,
],
\&FS::UI::Web::cust_fields,
@extra_fields,
],
+ 'sort_fields' => [
+ FS::UI::Web::cust_sort_fields(),
+ @extra_sort_fields,
+ ],
'color' => [ FS::UI::Web::cust_colors(),
map '', @extra_fields
],
'color' => [ FS::UI::Web::cust_colors(),
map '', @extra_fields
],
@@
-27,7
+31,11
@@
$cgi->param('cust_fields')
)
),
$cgi->param('cust_fields')
)
),
- map '', @extra_fields
+ map { $_ eq 'num_referrals'
+ ? $referral_link
+ : ''
+ }
+ @extra_fields
],
&>
<%init>
],
&>
<%init>
@@
-51,6
+59,7
@@
my @scalars = qw (
all_tags
all_pkg_classnums
any_pkg_status
all_tags
all_pkg_classnums
any_pkg_status
+ with_referrals referral_status
);
for my $param ( @scalars ) {
);
for my $param ( @scalars ) {
@@
-63,11
+72,20
@@
for my $param (qw( classnum refnum pkg_classnum )) {
$search_hash{$param} = [ $cgi->param($param) ];
}
$search_hash{$param} = [ $cgi->param($param) ];
}
-#tags
my $params = $cgi->Vars;
my $params = $cgi->Vars;
+
+#contacts
+$search_hash{'contacts'} = {
+ map { $_ => $cgi->param($_), }
+ grep { /^(contacts_*)/ && $cgi->param($_) }
+ keys %$params
+};
+
+#tags
$search_hash{'tagnum'} = [
map { /^tagnum(\d+)/ && $1 }
$search_hash{'tagnum'} = [
map { /^tagnum(\d+)/ && $1 }
- grep { /^tagnum(\d+)/ && $cgi->param($_) } keys %$params
+ grep { /^tagnum(\d+)/ && $cgi->param($_) }
+ keys %$params
];
###
];
###
@@
-105,12
+123,15
@@
$search_hash{'current_balance'} =
###
my $sql_query = FS::cust_main::Search->search(\%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'}) };
+my @extra_sort_fields = @{ delete($sql_query->{'extra_sort_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
###
@@
-119,8
+140,14
@@
my $menubar = [];
if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') ) {
if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') ) {
+ # URI::query_from does not support hashref
+ # results in: ...&contacts=HASH(0x55e16cb81da8)&...
+ my %query_hash = %search_hash;
+ delete $query_hash{contacts}
+ if exists $query_hash{contacts} && ref $query_hash{contacts};
+
my $uri = new URI;
my $uri = new URI;
- $uri->query_form( \%
search
_hash );
+ $uri->query_form( \%
query
_hash );
my $query = $uri->query;
push @$menubar, emt('Email a notice to these customers') =>
my $query = $uri->query;
push @$menubar, emt('Email a notice to these customers') =>