fix credit searches by otaker

[freeside.git] / httemplate / search / cust_credit.html

diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index b978e62..279d682 100755 (executable)
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -5,7 +5,7 @@
    my @search = ();
 
    if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) {
-     push @search, "otaker = '$1'";
+     push @search, "cust_credit.otaker = '$1'";
    }
 
    if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
@@ -46,13 +46,22 @@
 
    my $sql_query   = {
      'table'     => 'cust_credit',
-     'select'    => 'cust_credit.*, cust_main.last, cust_main.first, cust_main.company',
+     'select'    => join(', ',
+                      'cust_credit.*',
+                      'cust_main.custnum as cust_main_custnum',
+                      FS::UI::Web::cust_sql_fields(),
+                    ),
      'hashref'   => {},
      'extra_sql' => $where,
      'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
    };
 
-   my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+     my $clink = sub {
+       my $cust_bill = shift;
+       $cust_bill->cust_main_custnum
+         ? [ "${p}view/cust_main.cgi?", 'custnum' ]
+         : '';
+     };
 
 %><%= include( 'elements/search.html',
                  'title'       => $title,
@@ -61,26 +70,26 @@
                  'count_query' => $count_query,
                  'count_addl'  => [ '$%.2f total credited', ],
                  #'redirect'    => $link,
-                 'header'      =>
-                   [ qw(Amount Date), 'Cust #', 'Contact name',
-                     qw(Company By Reason) ],
+                 'header'      => [ 'Amount',
+                                    'Date',
+                                    FS::UI::Web::cust_header(),
+                                    'By',
+                                    'Reason'
+                                  ],
                  'fields'      => [
                    #'crednum',
                    sub { sprintf('$%.2f', shift->amount ) },
                    sub { time2str('%b %d %Y', shift->_date ) },
-                   'custnum',
-                   sub { $_[0]->get('last'). ', '. $_[0]->first; },
-                   'company',
+                   \&FS::UI::Web::cust_fields,
                    'otaker',
                    'reason',
                  ],
-                 'align' => 'rrrllll',
+                 #'align' => 'rrrllll',
+                 'align' => 'rr',
                  'links' => [
                    '',
                    '',
-                   $clink,
-                   $clink,
-                   $clink,
+                   ( map { $clink } FS::UI::Web::cust_header() ),
                    '',
                    '',
                  ],