searching for voided payments by void date as well, RT#5786

[freeside.git] / httemplate / search / elements / cust_pay_or_refund.html

diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html
index add8427..874bd8a 100755 (executable)
--- a/httemplate/search/elements/cust_pay_or_refund.html
+++ b/httemplate/search/elements/cust_pay_or_refund.html
@@ -117,7 +117,6 @@ if ( $cgi->param('magic') ) {
   my $orderby;
   if ( $cgi->param('magic') eq '_date' ) {
 
-
     if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
       push @search, "agentnum = $1"; # $search{'agentnum'} = $1;
       my $agent = qsearchs('agent', { 'agentnum' => $1 } );
@@ -219,6 +218,13 @@ if ( $cgi->param('magic') ) {
     push @search, "_date >= $beginning ",
                   "_date <= $ending";
 
+    if ( $thing eq 'pay_void' ) {
+      my($v_beginning, $v_ending) =
+        FS::UI::Web::parse_beginning_ending($cgi, 'void');
+      push @search, "void_date >= $v_beginning ",
+                    "void_date <= $v_ending";
+    }
+
     push @search, FS::UI::Web::parse_lt_gt($cgi, $amount_field );
 
     $orderby = '_date';
@@ -288,7 +294,9 @@ if (    ( $curuser->access_right('View invoices') #XXX for now
      && ! $opt{'disable_link'}
    )
 {
-  $link = [ "${p}view/cust_$thing.html?${thing}num=", $thing.'num' ]
+  my $key = $thing eq 'pay_void' ? 'paynum' : $thing.'num';
+  my $q = ( $thing eq 'pay_void' ? 'void=1;' : '' ). "$key=";
+  $link = [ "${p}view/cust_$thing.html?$q", $key ]
 }
 
 my $cust_link = sub {