diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2019-01-03 12:38:32 -0500 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2019-01-03 12:38:32 -0500 |
| commit | 80cea05076d397b3b06246a3df4451aea415e9fc (patch) | |
| tree | 63ed368e066959a7e43d871098711133346eb6a5 /httemplate | |
| parent | 409cd8958c687ac468b4d4fbe84fefb8f1e2feec (diff) | |
RT 81913 - fixed error with batch email from advanced customer reports and contacts report
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/misc/email-customers.html | 11 | ||||
| -rw-r--r-- | httemplate/search/contact.html | 8 | ||||
| -rwxr-xr-x | httemplate/search/cust_main.html | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html index 3f8816c..b631165 100644 --- a/httemplate/misc/email-customers.html +++ b/httemplate/misc/email-customers.html @@ -184,7 +184,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> @@ -326,6 +326,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/contact.html b/httemplate/search/contact.html index 4b3fe83..24cb237 100644 --- a/httemplate/search/contact.html +++ b/httemplate/search/contact.html @@ -243,10 +243,15 @@ for my $col (@report) { my $classnum_url_part; if (@classnum) { - $classnum_url_part = join '', map{ "&classnums=$_" } @classnum, @dest; + $classnum_url_part = join '', map{ "&classnums=$_" } @classnum; $classnum_url_part .= '&classnums=0' if $classnum_null; } +my $dest_url_part; +if (@dest) { + $dest_url_part = join '', map{ "&dest=$_" } @dest; +} + # E-mail pipeline, from email-customers.html through to email queue job, # doesn't support cust_prospect table my $send_email_link = undef; @@ -262,6 +267,7 @@ if ($link eq 'cust_main') { '&refnum=1'. '&with_email=on'. $classnum_url_part. + $dest_url_part. "\">Email a notice to these customers</a>"; } diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html index 0a43a82..1cc44d6 100755 --- a/httemplate/search/cust_main.html +++ b/httemplate/search/cust_main.html @@ -143,6 +143,8 @@ 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}; |