X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=f7a1eb4c14db1c38a44a122973b9c5186bb372bf;hb=70203e3be5de0331ba031d94972c274183c595d2;hp=8e2863455a2df5bb2115ce8e72624cec46f5dde8;hpb=6b8c46fa00f08da19bf0c4899776d3f82ef524c6;p=freeside.git diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html index 8e2863455..f7a1eb4c1 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 ) ], $process_url, $pdest, &> @@ -66,8 +67,8 @@ 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 +80,10 @@ from/subject/body cgi params
<& /elements/input-text.html, @@ -165,14 +184,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')), &>> | <& /elements/tr-input-text.html, @@ -219,6 +238,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') || ''; @@ -262,6 +283,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); @@ -333,10 +357,38 @@ 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; + 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); + } + } + } } +my @contact_checkboxes = ( + [ 'invoice' => { label => 'Invoice recipients' } ] +); +foreach my $class (qsearch('contact_class', { disabled => '' })) { + push @contact_checkboxes, [ + $class->classnum, + { label => $class->classname } + ]; +} %init>