X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=cf3ab1b48ad0b3ae37aa283c19d9653803ce24e9;hb=a284ef4c8d9d43db336a77db4c34996344cd5717;hp=f52c6b36a38eae08ddedf64407ff4b9eac5bd404;hpb=560af69840e7e3fcebf65d5d56ca4efc0851efec;p=freeside.git
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index f52c6b36a..cf3ab1b48 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -184,7 +184,7 @@ Template:
},
&>
-% if ($send_to_domain) {
+% if ($send_to_domain && $cgi->param('custnum')) {
Email to voice
@@ -302,6 +302,8 @@ my $process_url = $opt{'process_url'} || 'process/email-customers.html';
my $title = $opt{'title'} || 'Send customer notices';
push( @no_search_fields, @{$opt{'no_search_fields'}} ) if $opt{'no_search_fields'};
+$m->comp('/elements/handle_uri_query');
+
my $table = $cgi->param('table') or die "'table' required";
my $agent_virt_agentnum = $cgi->param('agent_virt_agentnum') || '';
@@ -324,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,
@@ -361,6 +372,15 @@ if ( !$cgi->param('preview') ) {
$body ||= $content->body;
}
+ my $sql_query = "FS::$table"->search(\%search);
+ my $count_query = delete($sql_query->{'count_query'});
+ my $count_sth = dbh->prepare($count_query)
+ or die "Error preparing $count_query: ". dbh->errstr;
+ $count_sth->execute
+ or die "Error executing $count_query: ". $count_sth->errstr;
+ my $count_arrayref = $count_sth->fetchrow_arrayref;
+ $num_cust = $count_arrayref->[0];
+
} else {
my @checked_email_dest;
@@ -509,8 +529,8 @@ if ( my @in_classnums = $cgi->param('classnums') ) {
$dest_ischecked{message} = 1 unless %dest_ischecked;
my @optin_checkboxes = (
- [ 'message' => { label => 'Message recipients' } ],
- [ 'invoice' => { label => 'Invoice recipients' } ],
+ [ 'message' => { label => 'Message recipients', desc => 'send this notice to all message recipients for the '.$num_cust.' selected customers.' } ],
+ [ 'invoice' => { label => 'Invoice recipients', desc => 'send this notice to all invoice recipients for the '.$num_cust.' selected customers.' } ],
);
my @classnum_checkboxes = (
[ '0' => { label => '(None)' }],