X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=dc53f6d5527f1d057bf0f469710265f595657c5c;hp=8e2863455a2df5bb2115ce8e72624cec46f5dde8;hb=4747bfbea3f4abb66d05a2bd1abed69e28a4aa3d;hpb=fc672686f119da0b3b34fd3c73acc3fea81262e6 diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html index 8e2863455..dc53f6d55 100644 --- a/httemplate/misc/email-customers.html +++ b/httemplate/misc/email-customers.html @@ -7,8 +7,8 @@ selecting an existing msg_template, or creating a custom message, and shows a preview of the message before sending. If linked to as a popup, include the cgi parameter 'popup' for proper header handling. -This may also be used as an element in other pages, enabling you to provide an -alternate initial form while using this for search freezing/thawing and +This may also be used as an element in other pages, enabling you to provide +an alternate initial form while using this for search freezing/thawing and preview/send actions, with the following options: acl - the access right to use (defaults to 'Bulk send customer notices') @@ -48,6 +48,7 @@ from/subject/body cgi params + % if ( $cgi->param('preview') ) { % # preview mode: at this point we have a msg_template (either "real" or @@ -57,7 +58,7 @@ from/subject/body cgi params Preview notice <& /elements/progress-init.html, 'OneTrueForm', - [ qw( search table msgnum ) ], + [ qw( search table msgnum to_contact_classnum emailtovoice_contact custnum ) ], $process_url, $pdest, &> @@ -66,8 +67,10 @@ from/subject/body cgi params % # kludge these through hidden inputs because they're not really part % # of the template, but should be sticky during draft editing - - + + + + % if ( !$msg_template->disabled ) { <& /elements/tr-td-label.html, 'label' => 'Template:' &> @@ -79,6 +82,10 @@ from/subject/body cgi params <% $from |h %> + <& /elements/tr-td-label.html, 'label' => 'To contacts:' &> + <% join('
', @contact_classname) %> + + <& /elements/tr-td-label.html, 'label' => 'Subject:' &> <% $subject |h %> @@ -148,16 +155,54 @@ function toggle(obj) { % # if we've already established a draft template, don't let msgnum be changed <& /elements/hidden.html, field => 'msgnum', - curr_value => ($cgi->param('msgnum') || ''), + curr_value => ( scalar($cgi->param('msgnum')) || ''), &> % } else { Template: <& /elements/select-msg_template.html, onchange => 'toggle(this)', - curr_value => ($cgi->param('msgnum') || ''), + curr_value => ( scalar($cgi->param('msgnum')) || ''), &>
% } +% # 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 { + # 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 <& /elements/tr-td-label.html, 'label' => 'From:' &> <& /elements/tr-input-text.html, @@ -194,12 +239,25 @@ Template:
<& /elements/input-text.html, @@ -165,14 +210,14 @@ Template: 'value' => $conf->config('invoice_from_name', $agent_virt_agentnum) || $conf->config('company_name', $agent_virt_agentnum), #? 'size' => 20, - 'curr_value' => $cgi->param('from_name'), + 'curr_value' => scalar($cgi->param('from_name')), &> <\ <& /elements/input-text.html, 'field' => 'from_addr', 'type' => 'email', # HTML5, woot 'value' => $conf->config('invoice_from', $agent_virt_agentnum), 'size' => 20, - 'curr_value' => $cgi->param('from_addr'), + 'curr_value' => scalar($cgi->param('from_addr')), &>>
+ % } #end not action or alternate form + + <& /elements/footer.html &> <%init> @@ -208,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'; @@ -262,6 +324,9 @@ if ( $cgi->param('msgnum') =~ /^(\d+)$/ ) { or die "template not found: ".$cgi->param('msgnum'); } +my @contact_classnum; +my @contact_classname; + my $subject = $cgi->param('subject'); my $body = $cgi->param('body'); my ($html_body, $text_body); @@ -319,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, @@ -333,10 +400,51 @@ if ( !$cgi->param('preview') ) { my $cust_msg = $msg_template->prepare(%msgopts); $from = $cust_msg->env_from; $html_body = $cust_msg->preview; - if ( $cust_msg->header =~ /^subject: (.*)/mi ) { +#hmm. this came in with the #37098 rewrite, but isn't on v3 :/ +# causing problems with mangling subject of unrelated things +# should probably decode instead of ignore the UTF-8 thing, but +# this at least masks the ugliness for now :/ + if ( $cust_msg->header =~ /^subject: (.*)/mi && $1 !~ /^\=\?UTF-8/ ) { $subject = $1; } } + + # contact_class_X params + #we can't switch to multi_param until we're done supporting deb 7 + local($CGI::LIST_CONTEXT_WARN) = 0; + + 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 = ( + [ 'message' => { label => 'Message recipients' } ], + [ 'invoice' => { label => 'Invoice recipients' } ], +); + +foreach my $class (qsearch('contact_class', { disabled => '' })) { + push @contact_checkboxes, [ + $class->classnum, + { label => $class->classname } + ]; }