[freeside-commits] freeside/httemplate/search cust_credit.html, 1.15, 1.16 report_cust_credit.html, 1.15, 1.16

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv461/search

Modified Files:
	cust_credit.html report_cust_credit.html 
Log Message:
unapplied payment/refund/credit reports, RT#7503

Index: cust_credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_credit.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -d -r1.15 -r1.16
--- cust_credit.html	15 Aug 2010 07:00:21 -0000	1.15
+++ cust_credit.html	22 Sep 2010 00:08:29 -0000	1.16
@@ -3,56 +3,84 @@
                  'name'        => 'credits',
                  'query'       => $sql_query,
                  'count_query' => $count_query,
-                 'count_addl'  => [ '$%.2f total credited (gross)', ],
+                 'count_addl'  => \@count_addl,
                  #'redirect'    => $link,
-                 'header'      => [ 'Amount',
-                                    'Date',
+                 'header'      => \@header,
+                 'fields'      => \@fields,
+                 'align' => $align,
+                 'links' => \@links,
+                 'color' => \@color,
+                 'style' => \@style,
+      )
+%>
+<%init>
+
+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, $align, @links, @color, @style);
+$align = '';
+
+#amount
+push @header, 'Amount';
+push @fields, sub { $money_char .sprintf('%.2f', shift->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) };
+  $align .= 'r';
+  push @links, '';
+  push @color, '';
+  push @style, '';
+}
+
+push @header, 'Date', 
                                     'By',
                                     'Reason',
                                     FS::UI::Web::cust_header(),
-                                  ],
-                 'fields'      => [
-                   #'crednum',
-                   sub { sprintf('$%.2f', shift->amount ) },
-                   sub { time2str('%b %d %Y', shift->_date ) },
+              ;
+push @fields, sub { time2str('%b %d %Y', shift->_date ) },
                    'otaker',
                    'reason',
                    \&FS::UI::Web::cust_fields,
-                 ],
-                 #'align' => 'rrrllll',
-                 'align' => 'rrll'.FS::UI::Web::cust_aligns(),
-                 'links' => [
-                   '',
-                   '',
+              ;
+$align .= 'rll'.FS::UI::Web::cust_aligns(),
+push @links,  '',
                    '',
                    '',
                    ( map { $_ ne 'Cust. Status' ? $clink : '' }
                          FS::UI::Web::cust_header()
                    ),
-                 ],
-                 'color' => [ 
-                              '',
-                              '',
+              ;
+push @color,  '',
                               '',
                               '',
                               FS::UI::Web::cust_colors(),
-                            ],
-                 'style' => [ 
-                              '',
-                              '',
+              ;
+push @style,  '',
                               '',
                               '',
                               FS::UI::Web::cust_styles(),
-                            ],
-      )
-%>
-<%init>
-
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
-
-my $title = 'Credit Search Results';
-#my( $count_query, $sql_query );
+              ;
 
 my @search = ();
 
@@ -67,6 +95,10 @@
   $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 +108,33 @@
 #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(', ', at 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>

Index: report_cust_credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_credit.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -d -r1.15 -r1.16
--- report_cust_credit.html	15 Aug 2010 07:00:21 -0000	1.15
+++ report_cust_credit.html	22 Sep 2010 00:08:29 -0000	1.16
@@ -1,7 +1,8 @@
-<% include('/elements/header.html', 'Credit report' ) %>
+<% include('/elements/header.html', $title ) %>
 
 <FORM ACTION="cust_credit.html" METHOD="GET">
 <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
+<INPUT TYPE="hidden" NAME="unapplied" VALUE="<% $unapplied %>">
 
 <TABLE>
 
@@ -48,5 +49,9 @@
   map { $_ => qsearchs('access_user',{'usernum'=>$_})->username }
       @usernum;
 
+my $unapplied = $cgi->param('unapplied') ? 1 : 0;
+
+my $title = $cgi->param('unapplied') ? 
+              'Unapplied credit report' : 'Credit report';
 
 </%init>