X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_main.html;h=4c7fa14aa0fecdf322eff1e5e87698bbd4d8498f;hp=d9499e9b08bad3b8d5bded741f4336a72d0316c6;hb=1fe87434632f2627de487ca2aed6cfadea2c6061;hpb=467d7dc761ec4492aa285771920be1def76ea831

diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index d9499e9b0..4c7fa14aa 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -13,10 +13,10 @@
                     \&FS::UI::Web::cust_fields,
                     @extra_fields,
                   ],
-                  #'sort_fields' => [
-                  #  FS::UI::Web::cust_sort_fields(),
-                  #  @extra_sort_fields,
-                  #],
+                  'sort_fields' => [
+                    FS::UI::Web::cust_sort_fields(),
+                    @extra_sort_fields,
+                  ],
                   'color'       => [ FS::UI::Web::cust_colors(),
                                      map '', @extra_fields
                                    ],
@@ -140,13 +140,25 @@ my $menubar = [];
 
 if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') ) {
 
+  # set so invoice emails are default if showing that field.
+  $search_hash{'classnums'} = 'invoice' if $cgi->param('cust_fields') =~ /Invoicing email/;
+
+  # 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') =>
-                    "${p}misc/email-customers.html?table=cust_main&$query",
-
+  push @$menubar, emt('Email a notice to these customers message recipients') =>
+                    "${p}misc/email-customers.html?table=cust_main&classnums=message&$query";
+  push @$menubar, emt('Email a notice to these customers invoice recipients') =>
+                    "${p}misc/email-customers.html?table=cust_main&classnums=invoice&$query";
 }
 
 </%init>