X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_credit.html;h=43f112f8b6358a04cae264d2213338adb4ac15e0;hb=636dd1f25af52d35efe7a323a5765ff5adeadf83;hp=e4975c8de22dd2647110bbddd3705e81cc7b4684;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git

diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index e4975c8de..43f112f8b 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -3,47 +3,15 @@
                  'name'        => 'credits',
                  'query'       => $sql_query,
                  'count_query' => $count_query,
-                 'count_addl'  => [ '$%.2f total credited', ],
+                 'count_addl'  => \@count_addl,
                  #'redirect'    => $link,
-                 'header'      => [ 'Amount',
-                                    'Date',
-                                    FS::UI::Web::cust_header(),
-                                    'By',
-                                    'Reason'
-                                  ],
-                 'fields'      => [
-                   #'crednum',
-                   sub { sprintf('$%.2f', shift->amount ) },
-                   sub { time2str('%b %d %Y', shift->_date ) },
-                   \&FS::UI::Web::cust_fields,
-                   'otaker',
-                   'reason',
-                 ],
-                 #'align' => 'rrrllll',
-                 'align' => 'rr'.FS::UI::Web::cust_aligns().'ll',
-                 'links' => [
-                   '',
-                   '',
-                   ( map { $_ ne 'Cust. Status' ? $clink : '' }
-                         FS::UI::Web::cust_header()
-                   ),
-                   '',
-                   '',
-                 ],
-                 'color' => [ 
-                              '',
-                              '',
-                              FS::UI::Web::cust_colors(),
-                              '',
-                              '',
-                            ],
-                 'style' => [ 
-                              '',
-                              '',
-                              FS::UI::Web::cust_styles(),
-                              '',
-                              '',
-                            ],
+                 'header'      => \@header,
+                 'fields'      => \@fields,
+                 'sort_fields' => \@sort_fields,
+                 'align' => $align,
+                 'links' => \@links,
+                 'color' => \@color,
+                 'style' => \@style,
       )
 %>
 <%init>
@@ -51,13 +19,77 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
 
+my $money_char = FS::Conf->new->config('money_char') || '$';
+
 my $title = 'Credit Search Results';
 #my( $count_query, $sql_query );
 
+my $unapplied = $cgi->param('unapplied');
+$title = "Unapplied $title" if $unapplied;
+my $clink = sub {
+  my $cust_bill = shift;
+  $cust_bill->cust_main_custnum
+    ? [ "${p}view/cust_main.cgi?", 'custnum' ]
+    : '';
+};
+
+my (@header, @fields, @sort_fields, $align, @links, @color, @style);
+$align = '';
+
+#amount
+push @header, 'Amount';
+push @fields, sub { $money_char .sprintf('%.2f', shift->amount) };
+push @sort_fields, 'amount';
+$align .= 'r';
+push @links, '';
+push @color, '';
+push @style, '';
+
+# unapplied amount
+if ($unapplied) {
+  push @header, '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',
+              FS::UI::Web::cust_header(),
+              ;
+push @fields, sub { time2str('%b %d %Y', shift->_date ) },
+              'otaker',
+              'reason',
+              \&FS::UI::Web::cust_fields,
+              ;
+push @sort_fields, '_date', 'otaker', 'reason';
+$align .= 'rll'.FS::UI::Web::cust_aligns(),
+push @links,  '',
+              '',
+              '',
+              ( map { $_ ne 'Cust. Status' ? $clink : '' }
+                         FS::UI::Web::cust_header()
+                   ),
+              ;
+push @color,  '',
+              '',
+              '',
+              FS::UI::Web::cust_colors(),
+              ;
+push @style,  '',
+              '',
+              '',
+              FS::UI::Web::cust_styles(),
+              ;
+
 my @search = ();
 
-if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) {
-  push @search, "cust_credit.otaker = '$1'";
+if ( $cgi->param('usernum') =~ /^(\d+)$/ ) {
+  push @search, "cust_credit.usernum = $1";
 }
 
 if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
@@ -67,6 +99,10 @@ if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
   $title = $agent->agent. " $title";
 }
 
+if ( $unapplied ) {
+  push @search, FS::cust_credit->unapplied_sql . ' > 0';
+}
+
 my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
 push @search, "_date >= $beginning ",
               "_date <= $ending";
@@ -76,29 +112,33 @@ push @search, FS::UI::Web::parse_lt_gt($cgi, 'amount' );
 #here is the agent virtualization
 push @search, $FS::CurrentUser::CurrentUser->agentnums_sql;
 
+my @select = (
+    'cust_credit.*',
+    'cust_main.custnum as cust_main_custnum',
+    FS::UI::Web::cust_sql_fields(),
+);
+
+if ( $unapplied ) {
+  push @select, '('.FS::cust_credit->unapplied_sql .') AS unapplied_amount';
+  push @search, FS::cust_credit->unapplied_sql .' > 0';
+}
+
 my $where = 'WHERE '. join(' AND ', @search);
 
-my $count_query = 'SELECT COUNT(*), SUM(amount) '.
-                  'FROM cust_credit LEFT JOIN cust_main USING ( custnum ) '.
+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 ) '.
                   $where;
 
+my @count_addl = ( $money_char.'%.2f total credited (gross)' );
+push @count_addl, $money_char.'%.2f unapplied' if $unapplied;
+
 my $sql_query   = {
   'table'     => 'cust_credit',
-  'select'    => join(', ',
-                   'cust_credit.*',
-                   'cust_main.custnum as cust_main_custnum',
-                   FS::UI::Web::cust_sql_fields(),
-                 ),
+  'select'    => join(', ',@select),
   'hashref'   => {},
   'extra_sql' => $where,
   'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
 };
 
-  my $clink = sub {
-    my $cust_bill = shift;
-    $cust_bill->cust_main_custnum
-      ? [ "${p}view/cust_main.cgi?", 'custnum' ]
-      : '';
-  };
-
 </%init>