X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_credit.html;h=d1f41df00ca8fb71e9254bdbe2b09016ee469d93;hb=120718856665ca90ad852535d1155f8ea8ecb6b6;hp=a3b22b1135992683152ff8a647208c1c6ea4c01a;hpb=0f239ed9a3d20edc4974eed38d2816f20185aefc;p=freeside.git

diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index a3b22b113..d1f41df00 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -1,18 +1,17 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
                  'title'       => $title,
-                 'name'        => 'credits',
+                 'name'        => emt('credits'),
                  'query'       => $sql_query,
                  'count_query' => $count_query,
                  'count_addl'  => \@count_addl,
-                 #'redirect'    => $link,
                  'header'      => \@header,
                  'fields'      => \@fields,
+                 'sort_fields' => \@sort_fields,
                  'align' => $align,
                  'links' => \@links,
                  'color' => \@color,
                  'style' => \@style,
-      )
-%>
+&>
 <%init>
 
 die "access denied"
@@ -20,11 +19,10 @@ die "access denied"
 
 my $money_char = FS::Conf->new->config('money_char') || '$';
 
-my $title = 'Credit Search Results';
-#my( $count_query, $sql_query );
+my $title = emt('Credit Search Results');
 
 my $unapplied = $cgi->param('unapplied');
-$title = "Unapplied $title" if $unapplied;
+$title = emt("Unapplied $title") if $unapplied;
 my $clink = sub {
   my $cust_bill = shift;
   $cust_bill->cust_main_custnum
@@ -32,12 +30,13 @@ my $clink = sub {
     : '';
 };
 
-my (@header, @fields, $align, @links, @color, @style);
+my (@header, @fields, @sort_fields, $align, @links, @color, @style);
 $align = '';
 
 #amount
-push @header, 'Amount';
+push @header, emt('Amount');
 push @fields, sub { $money_char .sprintf('%.2f', shift->amount) };
+push @sort_fields, 'amount';
 $align .= 'r';
 push @links, '';
 push @color, '';
@@ -45,17 +44,18 @@ push @style, '';
 
 # unapplied amount
 if ($unapplied) {
-  push @header, 'Unapplied';
+  push @header, emt('Unapplied');
   push @fields, sub { $money_char .sprintf('%.2f', shift->unapplied_amount) };
+  push @sort_fields, '';
   $align .= 'r';
   push @links, '';
   push @color, '';
   push @style, '';
 }
 
-push @header, 'Date', 
-              'By',
-              'Reason',
+push @header, emt('Date'), 
+              emt('By'),
+              emt('Reason'),
               FS::UI::Web::cust_header(),
               ;
 push @fields, sub { time2str('%b %d %Y', shift->_date ) },
@@ -63,6 +63,7 @@ push @fields, sub { time2str('%b %d %Y', shift->_date ) },
               'reason',
               \&FS::UI::Web::cust_fields,
               ;
+push @sort_fields, '_date', 'otaker', 'reason';
 $align .= 'rll'.FS::UI::Web::cust_aligns(),
 push @links,  '',
               '',
@@ -95,6 +96,19 @@ if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
   $title = $agent->agent. " $title";
 }
 
+if ( $cgi->param('refnum') && $cgi->param('refnum') =~ /^(\d+)$/ ) {
+  push @search, "refnum = $1";
+  my $part_referral = qsearchs('part_referral', { 'refnum' => $1 } );
+  die "unknown refnum $1" unless $part_referral;
+  $title = $part_referral->referral. " $title";
+}
+
+if ( $cgi->param('cust_classnum') ) {
+  my @classnums = grep /^\d+$/, $cgi->param('cust_classnum');
+  push @search, 'cust_main.classnum IN('.join(',',@classnums).')'
+    if @classnums;
+}
+
 if ( $unapplied ) {
   push @search, FS::cust_credit->unapplied_sql . ' > 0';
 }
@@ -123,7 +137,7 @@ my $where = 'WHERE '. join(' AND ', @search);
 
 my $count_query = 'SELECT COUNT(*), SUM(amount) ';
 $count_query .= ', SUM(' . FS::cust_credit->unapplied_sql . ') ' if $unapplied;
-$count_query .= 'FROM cust_credit LEFT JOIN cust_main USING ( custnum ) '.
+$count_query .= 'FROM cust_credit'. FS::UI::Web::join_cust_main('cust_credit').
                   $where;
 
 my @count_addl = ( $money_char.'%.2f total credited (gross)' );
@@ -134,7 +148,7 @@ my $sql_query   = {
   'select'    => join(', ',@select),
   'hashref'   => {},
   'extra_sql' => $where,
-  'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
+  'addl_from' => FS::UI::Web::join_cust_main('cust_credit')
 };
 
 </%init>