X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=cf3ab1b48ad0b3ae37aa283c19d9653803ce24e9;hp=b228b72024cedc782687859242030664ba9d35b0;hb=1fe87434632f2627de487ca2aed6cfadea2c6061;hpb=db9355be0f00722df45b3cecf9b55c43ede4ae3f diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html index b228b7202..cf3ab1b48 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:' &> @@ -164,17 +166,62 @@ 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 - }, - &> + + + + +% if (@active_classes) { + + + + +% } + +
Send to contacts: +
+ <& /elements/checkboxes.html, + 'style' => 'display: inline; vertical-align: top', + 'disable_links' => 1, + 'names_list' => \@optin_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) = @_; + exists $dest_ischecked{$name}; + }, + &> +
+% if ($send_to_domain && $cgi->param('custnum')) { +
+ Email to voice +
+ +% } +
Contact Type: +
+ <& /elements/checkboxes.html, + 'style' => 'display: inline; vertical-align: top', + 'disable_links' => 1, + 'names_list' => \@classnum_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) = @_; + exists $classnum_ischecked{$name}; + }, + &> +
+

% # if sending a one-off message, show a form to edit it @@ -213,12 +260,25 @@ Send to contacts:
+ % } #end not action or alternate form + + <& /elements/footer.html &> <%init> @@ -227,17 +287,23 @@ 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'; 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') || ''; @@ -260,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, @@ -297,8 +372,32 @@ 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; + my @checked_contact_type; + for ($cgi->param) { + if (/^contact_class_(.+)$/) { + my $f = $1; + if ($f eq 'invoice' || $f eq 'message') { + push @checked_email_dest, $f; + } elsif ( $f =~ /^\d+$/ ) { + push @checked_contact_type, $f; + } + } + } + $search{with_email_dest} = \@checked_email_dest if @checked_email_dest; + $search{with_contact_type} = \@checked_contact_type if @checked_contact_type; + my $sql_query = "FS::$table"->search(\%search); my $count_query = delete($sql_query->{'count_query'}); my $count_sth = dbh->prepare($count_query) @@ -341,12 +440,16 @@ 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; + # Could use better error handling here... + die "No customers match the search criteria" unless ref $object; + $cust = $object->cust_main; my %msgopts = ( 'cust_main' => $cust, 'object' => $object, @@ -355,7 +458,11 @@ 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; } } @@ -363,26 +470,71 @@ 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 ? $contact_class->classname : '(none)' + ); + } } } } } -my @contact_checkboxes = ( - [ 'invoice' => { label => 'Invoice recipients' } ] -); -foreach my $class (qsearch('contact_class', { disabled => '' })) { - push @contact_checkboxes, [ - $class->classnum, - { label => $class->classname } - ]; +# Build data structures for "Opt In" and "Contact Type" checkboxes +# +# By default, message recipients will be selected, this is a message. +# By default, all Contact Types will be selected, but this may be +# overridden by passing 'classnums' get/post values. If no contact +# types have been defined, the option will not be presented. + +my @active_classes = qsearch(contact_class => {disabled => ''} ); + +my %classnum_ischecked; +my %dest_ischecked; + +$CGI::LIST_CONTEXT_WARN = 0; +if ( my @in_classnums = $cgi->param('classnums') ) { + # Set checked boxes from form input + for my $v (@in_classnums) { + + if ( $v =~ /^\d+$/ ) { + $classnum_ischecked{$v} = 1 + } elsif ( $v =~ /^(invoice|message)$/ ) { + $dest_ischecked{$v} = 1; + } + + } +} else { + # Checked boxes default values + $classnum_ischecked{$_->classnum} = 1 for @active_classes; + $classnum_ischecked{0} = 1; } + +# At least one destination is required +$dest_ischecked{message} = 1 unless %dest_ischecked; + +my @optin_checkboxes = ( + [ '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)' }], + map { [ $_->classnum => {label => $_->classname} ] } @active_classes, +); +