X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=ad67b8d7e2bdc1b11aa5e3c8aa1360dd26c2d825;hb=b3495184423119719067c5438a0f09eabda16306;hp=759c8bf944867bdbda63d941b99f810d4f2ab92e;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index 759c8bf94..ad67b8d7e 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -76,7 +76,7 @@
@@ -104,21 +104,33 @@ Template:
)
%>
- <% include('/elements/tr-input-text.html',
- 'field' => 'from',
- 'label' => 'From:',
- )
- %>
-
+ <& /elements/tr-td-label.html, 'label' => 'From:' &>
+ <& /elements/input-text.html,
+ 'field' => 'from_name',
+ 'value' => $conf->config('company_name'), #?
+ 'size' => 20,
+ &> <\
+ <& /elements/input-text.html,
+ 'field' => 'from_addr',
+ 'type' => 'email', # HTML5, woot
+ 'value' => $conf->config('invoice_from'),
+ 'size' => 20,
+ &>> |
+
<% include('/elements/tr-input-text.html',
'field' => 'subject',
'label' => 'Subject:',
+ 'size' => 50,
)
%>
- Message: |
- <% include('/elements/htmlarea.html', 'field'=>'html_body') %> |
+ Message: |
+ <& /elements/htmlarea.html,
+ 'field' => 'html_body',
+ 'width' => 763,
+ &>
+ |
@@ -145,6 +157,7 @@ Template:
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices');
+my $conf = FS::Conf->new;
my $table = $cgi->param('table') or die "'table' required";
my %search;
if ( $cgi->param('search') ) {
@@ -160,10 +173,18 @@ else {
@search{keys %search} = map { /\0/ ? [ split /\0/, $_ ] : $_ } values %search;
}
-my $title = 'Send bulk customer notices';
+my $title = 'Send customer notices';
my $num_cust;
-my $from = $cgi->param('from') || '';
+my $from = '';
+if ( $cgi->param('from') ) {
+ $from = $cgi->param('from');
+} elsif ( $cgi->param('from_name') ) {
+ $from = ($cgi->param('from_name') . ' <' . $cgi->param('from_addr') . '>');
+} elsif ( $cgi->param('from_addr') ) {
+ $from = $cgi->param('from_addr');
+}
+
my $subject = $cgi->param('subject') || '';
my $html_body = $cgi->param('html_body') || '';
@@ -184,9 +205,14 @@ if ( $cgi->param('action') eq 'preview' ) {
{ msgnum => $cgi->param('msgnum') } )
or die "template not found: ".$cgi->param('msgnum');
$sql_query->{'extra_sql'} .= ' LIMIT 1';
+ $sql_query->{'select'} = "$table.*";
$sql_query->{'order_by'} = '';
- my $cust = qsearchs($sql_query)->cust_main;
- my %message = $msg_template->prepare( 'cust_main' => $cust );
+ my $object = qsearchs($sql_query);
+ my $cust = $object->cust_main;
+ my %message = $msg_template->prepare(
+ 'cust_main' => $cust,
+ 'object' => $object
+ );
($from, $subject, $html_body) = @message{'from', 'subject', 'html_body'};
}
}