diff options
| -rw-r--r-- | httemplate/misc/email-customers.html | 11 | ||||
| -rwxr-xr-x | httemplate/search/cust_main.html | 10 |
2 files changed, 19 insertions, 2 deletions
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html index 1c22f8ffd..577e5df8b 100644 --- a/httemplate/misc/email-customers.html +++ b/httemplate/misc/email-customers.html @@ -168,7 +168,7 @@ Template: }, &> </div> -% if ($send_to_domain) { +% if ($send_to_domain && $cgi->param('custnum')) { <div> <INPUT TYPE="checkbox" NAME="emailtovoice" ID="emailtovoice" VALUE="ON" onclick="toggleDiv(this)">Email to voice </div> @@ -295,6 +295,15 @@ else { @search{keys %search} = map { /\0/ ? [ split /\0/, $_ ] : $_ } values %search; } +# rebuild contacts hash +delete $search{contacts} + if exists $search{contacts} && ref $search{contacts}; +$search{'contacts'} = { + map { $_ => $search{$_}, } + grep { /^(contacts_*)/ && $search{$_} } + keys %search +}; + &{$opt{'post_search_hook'}}( 'conf' => $conf, 'search' => \%search, diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html index d4b4fafc1..7cfe5ec9b 100755 --- a/httemplate/search/cust_main.html +++ b/httemplate/search/cust_main.html @@ -133,8 +133,16 @@ my $menubar = []; 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; + foreach (keys %{$query_hash{contacts}}) { $query_hash{$_} = $query_hash{contacts}{$_}; } + + delete $query_hash{contacts} + if exists $query_hash{contacts} && ref $query_hash{contacts}; + 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') => |