X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_credit.html;h=c52394a5b6b3122407ba62d3e753f05399042518;hb=a0a5a11af6648c147a1e68877ac099035c18790a;hp=faaa7a817b55c0bf6ea9fc5b2816a0922c143137;hpb=f7fd2a3e34da751cbc02bbf215e99c6dc89adc15;p=freeside.git

diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index faaa7a817..c52394a5b 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -1,80 +1,84 @@
-<%
-   #my( $count_query, $sql_query );
-
-   my @search = ();
-
-   if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) {
-     push @search, "otaker = '$1'";
-   }
-
-   #false laziness with cust_pkg.cgi and cust_pay.cgi
-   if ( $cgi->param('beginning')
-        && $cgi->param('beginning') =~ /^([ 0-9\-\/]{1,10})$/ ) {
-     my $beginning = str2time($1);
-     push @search, "_date >= $beginning ";
-   }
-   if ( $cgi->param('ending')
-             && $cgi->param('ending') =~ /^([ 0-9\-\/]{1,10})$/ ) {
-     my $ending = str2time($1) + 86399;
-     push @search, " _date <= $ending ";
-   }
-
-   if ( $cgi->param('begin')
-        && $cgi->param('begin') =~ /^(\d+)$/ ) {
-     push @search, "_date >= $1 ";
-   }
-   if ( $cgi->param('end')
-             && $cgi->param('end') =~ /^(\d+)$/ ) {
-     push @search, " _date < $1 ";
-   }
-
-   my $where = scalar(@search)
-                 ? 'WHERE '. join(' AND ', @search)
-                 : '';
-
-   my $count_query = "SELECT COUNT(*), SUM(amount) FROM cust_credit $where";
-   my $sql_query   = {
-     'table'     => 'cust_credit',
-     'hashref'   => {},
-     'extra_sql' => $where,
-   };
-
-   my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
-
-%>
-<%= include( 'elements/search.html',
-               'title'       => 'Credit Search Results',
-               'name'        => 'credits',
-               'query'       => $sql_query,
-               'count_query' => $count_query,
-               'count_addl'  => [ '$%.2f total credited', ],
-               #'redirect'    => $link,
-               'header'      =>
-                 [ qw(Amount Date), 'Cust #', 'Contact name',
-                   qw(Company By Reason) ],
-               'fields'      => [
-                 #'crednum',
-                 sub { sprintf('$%.2f', shift->amount ) },
-                 sub { time2str('%b %d %Y', shift->_date ) },
-                 'custnum',
-                 sub { my $cust_main = shift->cust_main;
-                       $cust_main->get('last'). ', '. $cust_main->first;
-                     },
-                 sub { my $cust_main = shift->cust_main;
-                       $cust_main->company;
-                     },
-                 'otaker',
-                 'reason',
-               ],
-               'align' => 'rrrllll',
-               'links' => [
-                 '',
-                 '',
-                 $clink,
-                 $clink,
-                 $clink,
-                 '',
-                 '',
-               ],
-    )
+%
+%   my $title = 'Credit Search Results';
+%   #my( $count_query, $sql_query );
+%
+%   my @search = ();
+%
+%   if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) {
+%     push @search, "cust_credit.otaker = '$1'";
+%   }
+%
+%   if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+%     push @search, "agentnum = $1";
+%     my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+%     die "unknown agentnum $1" unless $agent;
+%     $title = $agent->agent. " $title";
+%   }
+%
+%   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+%   push @search, "_date >= $beginning ",
+%                 "_date <= $ending";
+%
+%   push @search, FS::UI::Web::parse_lt_gt($cgi, 'amount' );
+%
+%   #here is the agent virtualization
+%   push @search, $FS::CurrentUser::CurrentUser->agentnums_sql;
+%
+%   my $where = 'WHERE '. join(' AND ', @search);
+%
+%   my $count_query = 'SELECT COUNT(*), SUM(amount) '.
+%                     'FROM cust_credit LEFT JOIN cust_main USING ( custnum ) '.
+%                     $where;
+%
+%   my $sql_query   = {
+%     'table'     => 'cust_credit',
+%     '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 = sub {
+%       my $cust_bill = shift;
+%       $cust_bill->cust_main_custnum
+%         ? [ "${p}view/cust_main.cgi?", 'custnum' ]
+%         : '';
+%     };
+%
+%
+<% include( 'elements/search.html',
+                 'title'       => $title,
+                 'name'        => 'credits',
+                 'query'       => $sql_query,
+                 'count_query' => $count_query,
+                 'count_addl'  => [ '$%.2f total credited', ],
+                 #'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',
+                 'links' => [
+                   '',
+                   '',
+                   ( map { $clink } FS::UI::Web::cust_header() ),
+                   '',
+                   '',
+                 ],
+      )
 %>