- <% include('/elements/tr-input-text.html',
- 'field' => 'from',
- 'label' => 'From:',
- 'size' => 50,
- )
- %>
-
+ <& /elements/tr-td-label.html, 'label' => 'From:' &>
+ <& /elements/input-text.html,
+ 'field' => 'from_name',
+ 'value' => $conf->config('invoice_from_name', $agent_virt_agentnum) ||
+ $conf->config('company_name', $agent_virt_agentnum), #?
+ 'size' => 20,
+ &> <\
+ <& /elements/input-text.html,
+ 'field' => 'from_addr',
+ 'type' => 'email', # HTML5, woot
+ 'value' => $conf->config('invoice_from', $agent_virt_agentnum),
+ 'size' => 20,
+ &>> |
+
<% include('/elements/tr-input-text.html',
'field' => 'subject',
'label' => 'Subject:',
@@ -120,9 +130,11 @@ Template:
Message: |
- <& '/elements/htmlarea.html',
- 'field' => 'html_body',
- 'width' => 600 &> |
+ <& /elements/htmlarea.html,
+ 'field' => 'html_body',
+ 'width' => 763,
+ &>
+ |
@@ -149,14 +161,23 @@ 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 $agent_virt_agentnum = $cgi->param('agent_virt_agentnum') || '';
+
+my $popup = $cgi->param('popup');
+my $url = $cgi->param('url');
+my $pdest = { 'message' => "Notice sent" };
+$pdest->{'url'} = $cgi->param('url') if $url;
+
my %search;
if ( $cgi->param('search') ) {
%search = %{ thaw(decode_base64($cgi->param('search'))) };
}
else {
%search = $cgi->Vars;
- delete $search{$_} for qw( action table from subject html_body text_body );
+ delete $search{$_} for qw( action table from subject html_body text_body popup url );
# FS::$table->search is expected to know which parameters might be
# multi-valued, and to accept scalar values for them also. No good
# solution to this since CGI can't tell whether a parameter _might_
@@ -167,7 +188,15 @@ else {
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') || '';