projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix Tokenized payinfo on upgrade if we can, RT#71513
[freeside.git]
/
httemplate
/
search
/
cust_msg.html
diff --git
a/httemplate/search/cust_msg.html
b/httemplate/search/cust_msg.html
index
401f52e
..
65460f7
100644
(file)
--- a/
httemplate/search/cust_msg.html
+++ b/
httemplate/search/cust_msg.html
@@
-19,7
+19,10
@@
ucfirst($_[0]->msgtype) || $_[0]->msgname
},
sub {
ucfirst($_[0]->msgtype) || $_[0]->msgname
},
sub {
- join('<BR>', split(/,\s*/, $_[0]->env_to) )
+ join('<BR>',
+ map { encode_entities($_->format) }
+ Email::Address->parse($_[0]->env_to)
+ )
},
'status',
sub { encode_entities($_[0]->error) },
},
'status',
sub { encode_entities($_[0]->error) },
@@
-59,8
+62,10
@@
my $conf = new FS::Conf;
my $title = 'Outgoing Message Log';
#here is the agent virtualization
my $title = 'Outgoing Message Log';
#here is the agent virtualization
-my $agentnums_sql =
- $FS::CurrentUser::CurrentUser->agentnums_sql( 'table' => 'cust_main' );
+my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql(
+ 'table' => 'cust_main',
+ 'null_right' => [ 'View system logs', 'Configuration' ],
+);
my @where = ( $agentnums_sql );
my @where = ( $agentnums_sql );
@@
-124,17
+129,17
@@
my $html_init = qq!<FORM ACTION="$p/search/cust_msg.html" METHOD="GET">
<TABLE cellspacing="10">!.
'<TR><TD>From '.
include('/elements/input-date-field.html',
<TABLE cellspacing="10">!.
'<TR><TD>From '.
include('/elements/input-date-field.html',
- { 'name' => 'beginning', 'value' =>
$cgi->param('beginning'
) }
+ { 'name' => 'beginning', 'value' =>
scalar($cgi->param('beginning')
) }
).
'</TD><TD> To '.
include('/elements/input-date-field.html',
).
'</TD><TD> To '.
include('/elements/input-date-field.html',
- { 'name' => 'ending', 'value' => (
$cgi->param('ending'
) || ''),
+ { 'name' => 'ending', 'value' => (
scalar($cgi->param('ending')
) || ''),
'noinit' => 1, }
).
'</TD><TD> Status '.
include('/elements/select.html',
'field' => 'status',
'noinit' => 1, }
).
'</TD><TD> Status '.
include('/elements/select.html',
'field' => 'status',
- 'curr_value' =>
$cgi->param('status'
) || '',
+ 'curr_value' =>
scalar($cgi->param('status')
) || '',
'options' => [ '', 'failed', 'sent', ],
'labels' => { '' => '(any)',
'failed' => 'failed',
'options' => [ '', 'failed', 'sent', ],
'labels' => { '' => '(any)',
'failed' => 'failed',
@@
-143,12
+148,13
@@
include('/elements/select.html',
'</TD><TD> Type '.
include('/elements/select.html',
'field' => 'msgtype',
'</TD><TD> Type '.
include('/elements/select.html',
'field' => 'msgtype',
- 'curr_value' =>
$cgi->param('msgtype'
) || '',
- 'options' => [ '', 'invoice', 'receipt', 'admin' ],
+ 'curr_value' =>
scalar($cgi->param('msgtype')
) || '',
+ 'options' => [ '', 'invoice', 'receipt', 'admin'
, 'report'
],
'labels' => { '' => '(any)',
'invoice' => 'Invoices',
'receipt' => 'Receipts',
'admin' => 'Admin notices',
'labels' => { '' => '(any)',
'invoice' => 'Invoices',
'receipt' => 'Receipts',
'admin' => 'Admin notices',
+ 'report' => 'Reports',
},
) .
'</TD>
},
) .
'</TD>