[freeside-commits] freeside/httemplate/search/elements cust_pay_or_refund.html, 1.9, 1.10 report_cust_pay_or_refund.html, NONE, 1.1

[Ivan,,,]

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

Modified Files:
	cust_pay_or_refund.html 
Added Files:
	report_cust_pay_or_refund.html 
Log Message:
fix payment and refund searches by otaker (now usernum), RT#9555

--- NEW FILE: report_cust_pay_or_refund.html ---
<%doc>

Examples:

  include( 'elements/report_cust_pay_or_refund.html',
               'thing'          => 'pay',
               'name_singular'  => 'payment',
         )

  include( 'elements/report_cust_pay_or_refund.html',
               'thing'          => 'refund',
               'name_singular'  => 'refund',
         )

</%doc>
<% include('/elements/header.html', $title ) %>

<FORM ACTION="<% $table %>.html" METHOD="GET">
<INPUT TYPE="hidden" NAME="magic" VALUE="_date">

<TABLE BGCOLOR="#cccccc" CELLSPACING=0>

  <TR>
    <TH CLASS="background" COLSPAN=2 ALIGN="left">
      <FONT SIZE="+1">Search options</FONT>
    </TH>
  </TR>

  <TR>
    <TD ALIGN="right"><% ucfirst(PL($name_singular)) %> of type: </TD>
    <TD>
      <SELECT NAME="payby" onChange="payby_changed(this)">
        <OPTION VALUE="">all</OPTION>
        <OPTION VALUE="CARD">credit card (all)</OPTION>
        <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
        <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
        <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
        <OPTION VALUE="CARD-Maestro">credit card (Maestro/Switch/Solo)</OPTION>
        <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
        <OPTION VALUE="BILL">check</OPTION>
        <OPTION VALUE="PREP">prepaid card</OPTION>
        <OPTION VALUE="CASH">cash</OPTION>
        <OPTION VALUE="WEST">Western Union</OPTION>
        <OPTION VALUE="MCRD">manual credit card</OPTION>
      </SELECT>
    </TD>
  </TR>

  <SCRIPT TYPE="text/javascript">
  
    function payby_changed(what) {
      if ( what.options[what.selectedIndex].value == 'BILL' ) {
	document.getElementById('checkno_caption').style.color = '#000000';
        what.form.payinfo.disabled = false;
	what.form.payinfo.style.backgroundColor = '#ffffff';
      } else {
	document.getElementById('checkno_caption').style.color = '#bbbbbb';
        what.form.payinfo.disabled = true;
	what.form.payinfo.style.backgroundColor = '#dddddd';
      }
    }

  </SCRIPT>

  <TR>
    <TD ALIGN="right"><FONT ID="checkno_caption" COLOR="#bbbbbb">Check #: </FONT></TD>
    <TD>
      <INPUT TYPE="text" NAME="payinfo" DISABLED STYLE="background-color: #dddddd">
    </TD>
  </TR>

  <% include( '/elements/tr-select-agent.html',
                 'curr_value'    => scalar($cgi->param('agentnum')),
                 'label'         => 'for agent: ',
                 'disable_empty' => 0,
             )
  %>

  <% include( '/elements/tr-select-user.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',
		'field' => 'paid',
            )
  %>

</TABLE>

<BR>
<INPUT TYPE="submit" VALUE="Get Report">

</FORM>

<% include('/elements/footer.html') %>
<%init>

my %opt = @_;
my $table = 'cust_'.$opt{'thing'};
my $name_singular = $opt{'name_singular'};

die "access denied"
  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');

my $void = $cgi->param('void') ? 1 : 0;

my $title = $void ? "Voided $name_singular report" : "\u$name_singular report";
$table .= '_void' if $void;

</%init>

Index: cust_pay_or_refund.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/elements/cust_pay_or_refund.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- cust_pay_or_refund.html	15 Mar 2010 06:18:55 -0000	1.9
+++ cust_pay_or_refund.html	15 Aug 2010 06:21:06 -0000	1.10
@@ -245,8 +245,8 @@
       push @search, "$table.payinfo = '$1'";
     }
 
-    if ( $cgi->param('otaker') =~ /^(\w+)$/ ) {
-      push @search, "$table.otaker = '$1'";
+    if ( $cgi->param('usernum') =~ /^(\d+)$/ ) {
+      push @search, "$table.usernum = $1";
     }
 
     #for cust_pay_pending...  statusNOT=done