RT# 81183 Fix crash processing payment with new payment method

[freeside.git] / httemplate / misc / timeworked.html

diff --git a/httemplate/misc/timeworked.html b/httemplate/misc/timeworked.html
index 46063e8..24a0f5d 100755 (executable)
--- a/httemplate/misc/timeworked.html
+++ b/httemplate/misc/timeworked.html
@@ -8,22 +8,11 @@
 
   <THEAD>
     <TR>
-      <TH>Trans</TH>
       <TH COLSPAN="2">Ticket</TH>
-      <TH>Time</TH>
+      <TH>Hours</TH>
       <TH COLSPAN="2">Customer</TH>
       <TH>Multiplier</TH>
     </TR>
-
-    <TR>
-      <TH>#</TH>
-      <TH>#</TH>
-      <TH>Subject</TH>
-      <TH>hours</TH>
-      <TH>#</TH>
-      <TH>Name</TH>
-      <TH></TH>
-    </TR>
   </THEAD>
 
   <TBODY>
@@ -35,9 +24,9 @@
 %     my ($custnum, $name) = split(':', pop @customers, 2);
 %     my $link = $p. 'rt/Ticket/Display.html?id='. $ticketmap{$tr_id}.
 %                    '#txn-'. $tr_id;
+%     my $clink = $p. 'view/cust_main.cgi?'. $custnum;
 
       <TR>
-        <TD><a href="<% $link %>"><% $tr_id %></a></TD>
         <TD><a href="<% $link %>"><% $ticketmap{$tr_id} %></a></TD>
         <TD><a href="<% $link %>"><% $ticket{$ticketmap{$tr_id}} |h %></a></TD>
 
@@ -47,8 +36,8 @@
 %       }
 
         <TD><% sprintf("%0.2f", $seconds/3600) %></TD>
-        <TD ALIGN="right"><% $custnum %></TD>
-        <TD ALIGN="right"><% $name %></TD>
+        <TD ALIGN="right"><a href="<% $clink %>"><% $custnum %></a></TD>
+        <TD ALIGN="right"><a href="<% $clink %>"><% $name %></a></TD>
         <TD>
           <INPUT TYPE="hidden" NAME="transactionid<%$tr_id%>" VALUE="1" >
           <INPUT TYPE="hidden" NAME="seconds<%$tr_id%>" VALUE="<% $seconds %>" >
@@ -65,10 +54,11 @@
 
 %     foreach ( @customers ) {
 %       ($custnum, $name) = split(':', $_, 2);
+%       $clink = $p. 'view/cust_main.cgi?'. $custnum;
 
         <TR>
-          <TD ALIGN="right" COLSPAN="5" ><% $custnum %></TD>
-          <TD ALIGN="right"><% $name %></TD>
+          <TD ALIGN="right" COLSPAN="4" ><a href="<% $clink %>"><% $custnum %></a></TD>
+          <TD ALIGN="right"><a href="<% $clink %>"><% $name %></a></TD>
           <TD>
 
 %           $multiplier = $default_multiplier;
@@ -92,8 +82,9 @@
 
 <BR>
 
-<INPUT TYPE="hidden" NAME="begin" VALUE="<% $cgi->param('begin') |h %>">
-<INPUT TYPE="hidden" NAME="end"   VALUE="<% $cgi->param('end')   |h %>">
+<INPUT TYPE="hidden" NAME="begin"    VALUE="<% $cgi->param('begin')    |h %>">
+<INPUT TYPE="hidden" NAME="end"      VALUE="<% $cgi->param('end')      |h %>">
+<INPUT TYPE="hidden" NAME="category" VALUE="<% $cgi->param('category') |h %>">
 
 <INPUT TYPE="submit" NAME="submit" VALUE="<% $title %>">
 </FORM>
@@ -109,8 +100,6 @@ my(%ticketmap, %ticket, %customers);
 my $title = 'Assign Time Worked';
 tie %ticketmap, 'Tie::IxHash';
 
-RT::Init();
-
 my $CurrentUser = RT::CurrentUser->new();
 $CurrentUser->LoadByName($FS::CurrentUser::CurrentUser->username);
 
@@ -124,12 +113,15 @@ foreach my $id ( map { /^transactionid(\d+)$/; $1; }
     $ticket->Load($ticketmap{$id});
     $ticket{$ticketmap{$id}} = $ticket->Subject;
     $customers{$ticketmap{$id}} =
-                            [ map  { $_->Resolver->AsString }
-                              grep { $_->Resolver->{'fstable'} eq 'cust_main' }
-                              grep { $_->Scheme eq 'freeside' } 
-                              map  { $_->TargetURI } 
-                                @{ $ticket->_Links('Base')->ItemsArrayRef } 
-                            ];
+      [ map  { $_->Resolver->AsString }
+        grep { $_->Resolver->{'fstable'} eq 'cust_main' }
+        grep { $_->Scheme eq 'freeside' } 
+        map  { $_->TargetURI } 
+        grep {    $_->BaseURI->Scheme eq 'fsck.com-rt'
+               && $_->BaseURI->Resolver->ObjectType eq 'ticket'
+             }
+          @{ $ticket->_Links('Base')->ItemsArrayRef } 
+      ];
                             
   }
 }