X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_msg.html;h=2b6f08e3f647acc9b9811999483b7d76def24965;hb=4c1c80339ca89fc2bb4c59f0400b0ce49f77d893;hp=f71a86607786399cb9363c625bf6c9e9cb6ce64c;hpb=c38702f0a0e02e7ed45c8cb8dad86cd1a1ee4882;p=freeside.git
diff --git a/httemplate/search/cust_msg.html b/httemplate/search/cust_msg.html
index f71a86607..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,13 +15,21 @@
my $date = $_[0]->_date;
$date ? time2str('%Y-%m-%d %T',$_[0]->_date) : ''
},
- 'msgname',
+ 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' => [
@@ -31,12 +39,15 @@
'',
'',
],
- 'color' => [ ('') x 3,
- $statuscolor,
- $statuscolor,
+ 'color' => [ '',
+ $typecolor,
+ '',
+ $statuscolor,
+ $statuscolor,
],
'html_init' => $html_init,
'really_disable_download' => 1,
+ @_
&>
<%init>
#hmm...
@@ -51,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)";
@@ -79,16 +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 = (
'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!