fix date parsing when using international dates (package date edit), RT#8027

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

diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index 4b3da60..9a14dce 100755 (executable)
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -1,97 +1,104 @@
-<%
-   my $title = 'Credit Search Results';
-   #my( $count_query, $sql_query );
-
-   my @search = ();
-
-   if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) {
-     push @search, "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";
-   }
-
-   #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 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',
+<% include( 'elements/search.html',
                  'title'       => $title,
                  'name'        => 'credits',
                  'query'       => $sql_query,
                  'count_query' => $count_query,
-                 'count_addl'  => [ '$%.2f total credited', ],
+                 'count_addl'  => [ '$%.2f total credited (gross)', ],
                  #'redirect'    => $link,
                  'header'      => [ 'Amount',
                                     'Date',
-                                    FS::UI::Web::cust_header(),
                                     'By',
-                                    'Reason'
+                                    'Reason',
+                                    FS::UI::Web::cust_header(),
                                   ],
                  'fields'      => [
                    #'crednum',
                    sub { sprintf('$%.2f', shift->amount ) },
                    sub { time2str('%b %d %Y', shift->_date ) },
-                   \&FS::UI::Web::cust_fields,
                    'otaker',
                    'reason',
+                   \&FS::UI::Web::cust_fields,
                  ],
                  #'align' => 'rrrllll',
-                 'align' => 'rr',
+                 'align' => 'rrll'.FS::UI::Web::cust_aligns(),
                  'links' => [
                    '',
                    '',
-                   ( map { $clink } FS::UI::Web::cust_header() ),
                    '',
                    '',
+                   ( map { $_ ne 'Cust. Status' ? $clink : '' }
+                         FS::UI::Web::cust_header()
+                   ),
                  ],
+                 'color' => [ 
+                              '',
+                              '',
+                              '',
+                              '',
+                              FS::UI::Web::cust_colors(),
+                            ],
+                 '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 = ();
+
+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' ]
+      : '';
+  };
+
+</%init>