RT 81913 - fixed error with batch email from advanced customer reports and contacts report

2 files changed, 9 insertions, 1 deletions

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};