diff options
| author | ivan <ivan> | 2009-07-27 09:59:06 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2009-07-27 09:59:06 +0000 |
| commit | 342de0c0922c4fac8d6ace5a38670ace35366571 (patch) | |
| tree | 936f21fce20eb83cb94a69ad31f3544d801d40d0 /httemplate/search | |
| parent | b00657d2dd62614568501df47d1be4cbfa15eb48 (diff) | |
searching for voided payments by void date as well, RT#5786
Diffstat (limited to 'httemplate/search')
| -rwxr-xr-x | httemplate/search/elements/cust_pay_or_refund.html | 8 | ||||
| -rw-r--r-- | httemplate/search/report_cust_pay.html | 35 |
2 files changed, 40 insertions, 3 deletions
diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html index acd57912f..874bd8aa3 100755 --- 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'; diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html index a9695acb7..dd2358ad1 100644 --- a/httemplate/search/report_cust_pay.html +++ b/httemplate/search/report_cust_pay.html @@ -3,7 +3,13 @@ <FORM ACTION="<% $void ? 'cust_pay_void.html' : 'cust_pay.cgi' %>" METHOD="GET"> <INPUT TYPE="hidden" NAME="magic" VALUE="_date"> -<TABLE> +<TABLE BGCOLOR="#cccccc" CELLSPACING=0> + + <TR> + <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"> + <FONT SIZE="+1">Search options</FONT> + </TH> + </TR> <TR> <TD ALIGN="right">Payments of type: </TD> @@ -55,7 +61,32 @@ ) %> - <% include( '/elements/tr-input-beginning_ending.html' ) %> + <TR> + <TD ALIGN="right" VALIGN="center">Payment</TD> + <TD> + <TABLE> + <% include( '/elements/tr-input-beginning_ending.html', + layout => 'horiz', + ) + %> + </TABLE> + </TD> + </TR> + +% if ( $void ) { + <TR> + <TD ALIGN="right" VALIGN="center">Voided</TD> + <TD> + <TABLE> + <% include( '/elements/tr-input-beginning_ending.html', + prefix => 'void', + layout => 'horiz', + ) + %> + </TABLE> + </TD> + </TR> +% } <% include( '/elements/tr-input-lessthan_greaterthan.html', 'label' => 'Amount', |