X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=dc53f6d5527f1d057bf0f469710265f595657c5c;hp=d086c676d4a0afb679b82f0a7f6a2fc00192b0e4;hb=4747bfbea3f4abb66d05a2bd1abed69e28a4aa3d;hpb=a2ecb1cf6a6c084c521710f1256da082f70ba9e5
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index d086c676d..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,
&>
@@ -67,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:' &>
@@ -153,28 +155,52 @@ 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 {
- my($cgi, $name) = @_;
- $name eq 'invoice' #others default to unchecked
- },
- &>
+
% # if sending a one-off message, show a form to edit it
@@ -184,14 +210,14 @@ Send to contacts:
'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')),
&>>
<& /elements/tr-input-text.html,
@@ -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,
@@ -355,32 +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
- foreach my $param ( $cgi->multi_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);
+ #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 = (
- [ '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 }
];
}
+
%init>