X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Ftable-tickets.html;h=2fc0de936c66f41f6d7e66160018b816d63fcb53;hp=6d1a45a0d9eac899ef46961e9de05b5692250549;hb=b71b1576c68bc40ad26592b354feace37a029f0e;hpb=1c59bba12621e154765a8255534e94a041dfd200 diff --git a/httemplate/elements/table-tickets.html b/httemplate/elements/table-tickets.html index 6d1a45a0d..2fc0de936 100644 --- a/httemplate/elements/table-tickets.html +++ b/httemplate/elements/table-tickets.html @@ -5,12 +5,16 @@ View <% mt('resolved') |h %>
+% if ( @tickets ) { + <& /elements/table-grid.html &> % my $bgcolor1 = '#eeeeee'; % my $bgcolor2 = '#ffffff'; % my $bgcolor = ''; + + <% mt('#') |h %> <% mt('Subject') |h %> <% mt('Status') |h %> @@ -26,6 +30,7 @@ View <% mt('Service') |h %> % } + % foreach my $ticket ( @tickets ) { % my $href = FS::TicketSystem->href_ticket($ticket->{id}); @@ -38,11 +43,21 @@ View +% if ( $ticket->{is_unreplied} ) { + > +% } else { +% # placeholder + + + + ><% $ticket->{id} %> - ><% $ticket->{subject} %> + ><% $ticket->{subject} |h %> @@ -54,7 +69,7 @@ View - <% $ticket->{owner} %> + <% $ticket->{owner} |h %> @@ -69,12 +84,13 @@ View <% $ticket->{content} ? $ticket->{content}.' ('.$ticket->{priority}.')' : $ticket->{priority} + |h %> % if ( $ss_priority ) { - <% $ticket->{"CF.{$ss_priority}"} %> + <% $ticket->{"CF.{$ss_priority}"} |h %> % } % if ( $object->isa('FS::cust_main') ) { @@ -93,13 +109,15 @@ View +%} + <%init> -use Date::Parse qw(str2time); -use Date::Format qw(time2str); my %opt = @_; my $conf = new FS::Conf; +return '' unless $conf->config('ticket_system'); + my $object = $opt{'object'}; $object = $object->cust_svc if $object->isa('FS::svc_Common'); my( @tickets ) = $object->tickets; @@ -116,8 +134,10 @@ if ( $object->isa('FS::cust_main') ) { $object->custnum, { 'statuses' => [ 'resolved' ] } ); -} -elsif ( $object->isa('FS::cust_svc') ) { +} elsif ( $object->isa('FS::cust_svc') ) { + + return '' unless $object->pkgnum; + $thing = 'service'; $open_link = FS::TicketSystem->href_service_tickets($object->svcnum); @@ -151,7 +171,7 @@ if ( $ss_priority ) { my $format = $conf->config('date_format') || '%Y-%m-%d'; my $date_formatter = sub { - my $time = str2time($_[0], 'GMT'); + my $time = parse_datetime($_[0], 'GMT'); # exclude times within 24 hours of zero ($time > 86400) ? time2str($format, $time) : ''; };