X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=dc53f6d5527f1d057bf0f469710265f595657c5c;hp=0ed5ef380ed2b20ee3884df714aae728e0fa57f0;hb=4747bfbea3f4abb66d05a2bd1abed69e28a4aa3d;hpb=ace5df96f846d02ef044d67c89667d7d23c47f75 diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html index 0ed5ef380..dc53f6d55 100644 --- a/httemplate/misc/email-customers.html +++ b/httemplate/misc/email-customers.html @@ -58,7 +58,7 @@ from/subject/body cgi params Preview notice <& /elements/progress-init.html, 'OneTrueForm', - [ qw( search table msgnum to_contact_classnum ) ], + [ qw( search table msgnum to_contact_classnum emailtovoice_contact custnum ) ], $process_url, $pdest, &> @@ -69,6 +69,8 @@ from/subject/body cgi params % # of the template, but should be sticky during draft editing + + % if ( !$msg_template->disabled ) { <& /elements/tr-td-label.html, 'label' => 'Template:' &> @@ -164,17 +166,41 @@ Template:
% } % # select destination contact classes -Send to contacts: - <& /elements/checkboxes.html, - 'style' => 'display: inline; vertical-align: top', - 'disable_links' => 1, - 'names_list' => \@contact_checkboxes, - 'element_name_prefix' => 'contact_class_', - 'checked_callback' => sub { - my($cgi, $name) = @_; - $name eq 'invoice' #others default to unchecked - }, - &> + + + + + +
Send to contacts: +
+ <& /elements/checkboxes.html, + 'style' => 'display: inline; vertical-align: top', + 'disable_links' => 1, + 'names_list' => \@contact_checkboxes, + 'element_name_prefix' => 'contact_class_', + 'checked_callback' => sub { + # Called for each checkbox + # Return true to default as checked, false as unchecked + my($cgi, $name) = @_; + $name eq 'message' + }, + &> +
+% if ($send_to_domain) { +
+ Email to voice +
+ +% } +

% # if sending a one-off message, show a form to edit it @@ -213,12 +239,25 @@ Send to contacts:
+ % } #end not action or alternate form + + <& /elements/footer.html &> <%init> @@ -227,12 +266,16 @@ my %opt = @_; $opt{'acl'} ||= 'Bulk send customer notices'; +my $email_to; + die "access denied" unless $FS::CurrentUser::CurrentUser->access_right($opt{'acl'}); my $conf = FS::Conf->new; my @no_search_fields = qw( table from subject html_body text_body popup url ); +my $send_to_domain = $conf->config('email-to-voice_domain'); + my $form_action = $opt{'form_action'} || 'email-customers.html'; my $process_url = $opt{'process_url'} || 'process/email-customers.html'; my $title = $opt{'title'} || 'Send customer notices'; @@ -341,12 +384,14 @@ if ( !$cgi->param('preview') ) { # unless creating the msg_template failed, we now have one, so construct a # preview message from the first customer/whatever in the search results + my $cust; + if ( $msg_template ) { $sql_query->{'extra_sql'} .= ' LIMIT 1'; $sql_query->{'select'} = "$table.*"; $sql_query->{'order_by'} = ''; my $object = qsearchs($sql_query); - my $cust = $object->cust_main; + $cust = $object->cust_main; my %msgopts = ( 'cust_main' => $cust, 'object' => $object, @@ -367,26 +412,39 @@ if ( !$cgi->param('preview') ) { # contact_class_X params #we can't switch to multi_param until we're done supporting deb 7 local($CGI::LIST_CONTEXT_WARN) = 0; - foreach my $param ( $cgi->param ) { - if ( $param =~ /^contact_class_(\w+)$/ ) { - push @contact_classnum, $1; - if ( $1 eq 'invoice' ) { - push @contact_classname, 'Invoice recipients'; - } else { - my $contact_class = FS::contact_class->by_key($1); - push @contact_classname, encode_entities($contact_class->classname); + + if ($cgi->param('emailtovoice_contact')) { + $email_to = $cgi->param('emailtovoice_contact') . '@' . $send_to_domain; + push @contact_classnum, 'emailtovoice'; + push @contact_classname, $email_to; + } + else { + foreach my $param ( $cgi->param ) { + if ( $param =~ /^contact_class_(\w+)$/ ) { + push @contact_classnum, $1; + if ( $1 eq 'invoice' ) { + push @contact_classname, 'Invoice recipients'; + } elsif ( $1 eq 'message' ) { + push @contact_classname, 'Message recipients'; + } else { + my $contact_class = FS::contact_class->by_key($1); + push @contact_classname, encode_entities($contact_class->classname); + } } } } } my @contact_checkboxes = ( - [ 'invoice' => { label => 'Invoice recipients' } ] + [ 'message' => { label => 'Message recipients' } ], + [ 'invoice' => { label => 'Invoice recipients' } ], ); + foreach my $class (qsearch('contact_class', { disabled => '' })) { push @contact_checkboxes, [ $class->classnum, { label => $class->classname } ]; } +