X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fsearch%2Fcust_msg.html;h=2b6f08e3f647acc9b9811999483b7d76def24965;hb=9fae251fc1e3069694ebaf4fae62bde844f45cff;hp=7932ab3a2e602f2330804e4ede29406a664c5373;hpb=bb119c4cc86e906f698a205437790bd8f96bb3d0;p=freeside.git
diff --git a/httemplate/search/cust_msg.html b/httemplate/search/cust_msg.html
index 7932ab3a2..2b6f08e3f 100644
--- a/httemplate/search/cust_msg.html
+++ b/httemplate/search/cust_msg.html
@@ -1,11 +1,11 @@
<& 'elements/search.html',
'title' => $title,
- 'name' => 'messages',
+ 'name_singular' => 'message',
'query' => $query,
'count_query' => $count_query,
'header' => [
'Date',
- 'Template',
+ 'Type',
'Destination',
'Status',
'', #error
@@ -15,11 +15,21 @@
my $date = $_[0]->_date;
$date ? time2str('%Y-%m-%d %T',$_[0]->_date) : ''
},
- 'msgname',
- 'env_to',
+ sub {
+ ucfirst($_[0]->msgtype) || $_[0]->msgname
+ },
+ sub {
+ join('
', split(/,\s*/, $_[0]->env_to) )
+ },
'status',
sub { encode_entities($_[0]->error) },
],
+ 'sort_fields' => [ '_date',
+ 'msgtype',
+ 'env_to',
+ 'status',
+ 'error',
+ ],
'align' => 'rllcl',
'links' => [ ],
'link_onclicks' => [
@@ -29,17 +39,20 @@
'',
'',
],
- 'color' => [ ('') x 3,
- $statuscolor,
- $statuscolor,
+ 'color' => [ '',
+ $typecolor,
+ '',
+ $statuscolor,
+ $statuscolor,
],
'html_init' => $html_init,
'really_disable_download' => 1,
+ @_
&>
<%init>
#hmm...
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('View customers of all agents');
+ unless $FS::CurrentUser::CurrentUser->access_right('View email logs');
my $conf = new FS::Conf;
@@ -49,6 +62,12 @@ my @where;
if ( $cgi->param('status') =~ /^(\w+)$/ ) {
push @where, "status = '$1'";
}
+if ( $cgi->param('msgtype') =~ /^(\w+)$/ ) {
+ push @where, "msgtype = '$1'";
+}
+if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+ push @where, "custnum = $1";
+}
my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '');
push @where, "(_date >= $beginning AND _date <= $ending)";
@@ -77,17 +96,22 @@ my $sub_popup_link = sub {
include('/elements/popup_link_onclick.html',
'action' => $p. 'view/cust_msg.html?' . $custmsgnum,
'actionlabel' => 'Message detail',
- 'width' => 600,
- 'height' => 500,
+ 'width' => 680,
+ 'height' => 550,
);
};
my %color = (
- 'prepared' => '0000FF',
'failed' => 'FF0000',
'sent' => '',
+
+ 'invoice' => '00CC00',
+ 'receipt' => '0000CC',
+ 'admin' => 'CC0000',
+ '' => '000000',
);
my $statuscolor = sub { $color{$_[0]->status} };
+my $typecolor = sub { $color{$_[0]->msgtype} };
my $html_init = qq!