X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Freport_cust_pay_or_refund.html;h=bff470a691f7d5fc2bea94df8a63942a53c6aab6;hb=d10a3e73a1c3e46f2c784d2aa4e7b3e621c336e2;hp=70727c00774a81c7e2c21c44bbe5a81df3cc05b0;hpb=062f38f2f5d0da64c6fd0702d4df2e805473a1f5;p=freeside.git

diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html
index 70727c007..bff470a69 100644
--- a/httemplate/search/elements/report_cust_pay_or_refund.html
+++ b/httemplate/search/elements/report_cust_pay_or_refund.html
@@ -19,31 +19,34 @@ Examples:
 <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
 <INPUT TYPE="hidden" NAME="unapplied" VALUE="<% $unapplied %>">
 
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
-
-  <TR>
-    <TH CLASS="background" COLSPAN=2 ALIGN="left">
-      <FONT SIZE="+1"><% mt('Payment search options') |h %></FONT>
-    </TH>
-  </TR>
+  <FONT CLASS="fsinnerbox-title"><% emt('[_1] search options', ucfirst($name_singular)) %></FONT>
+  <TABLE CLASS="fsinnerbox">
 
   <& /elements/tr-select.html,
     label     => ucfirst(PL($name_singular)) . ' of type:',
     field     => 'payby',
-    options   => [ keys(\%payby) ],
+    options   => [ keys %payby ],
     labels    => \%payby,
     multiple  => 1,
-    size      => 16
+    size      => 18,
   &>
 
+% if (substr($conf->config('card_masking_method'), -5) eq 'last4' || !$conf->config('card_masking_method')) {
   <TR>
-    <TD ALIGN="right"><% mt('Check #:') |h %> </TD>
+    <TH ALIGN="right"><% mt('Card Last 4 #:') |h %></TH>
+    <TD>
+      <INPUT TYPE="text" ID="paymask" NAME="paymask">
+    </TD>
+  </TR>
+% } 
+  <TR>
+    <TH ALIGN="right"><% mt('Check #:') |h %> </TH>
     <TD>
       <INPUT TYPE="text" ID="payinfo" NAME="payinfo">
     </TD>
   </TR>
   <TR>
-    <TD ALIGN="right"><% mt('Transaction #:') |h %> </TD>
+    <TH ALIGN="right"><% mt('Transaction #:') |h %> </TH>
     <TD>
       <INPUT TYPE="text" ID="ccpay" NAME="ccpay">
     </TD>
@@ -51,8 +54,22 @@ Examples:
 
   <& /elements/tr-select-user.html &>
 
+% if ( $has_reason ) {
+%   # limit to reasons that are in use for the table being reported on
+%   # (maybe order by count(*) desc?)
+  <& /elements/tr-select-table.html,
+    label       => emt('Reason'),
+    field       => 'reasonnum',
+    id          => 'reasonnum',
+    table       => 'reason',
+    name_col    => 'reason',
+    extra_sql   => " WHERE EXISTS(SELECT 1 FROM $table WHERE $table.reasonnum = reason.reasonnum) ",
+    empty_label => emt('any'),
+  &>
+% }
+
   <TR>
-    <TD ALIGN="right" VALIGN="center"><% mt(ucfirst($name_singular). ' date') |h %></TD>
+    <TH ALIGN="right" VALIGN="center"><% mt(ucfirst($name_singular). ' date') |h %></TH>
     <TD>
       <TABLE>
         <& /elements/tr-input-beginning_ending.html,
@@ -65,7 +82,7 @@ Examples:
 
 % if ( $void ) {
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Voided') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('Voided') |h %></TH>
       <TD>
         <TABLE>
           <& /elements/tr-input-beginning_ending.html,
@@ -97,13 +114,12 @@ Examples:
 <BR>
 
 
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+<FONT CLASS="fsinnerbox-title"><% emt('Customer search options') %></FONT>
+<TABLE CLASS="fsinnerbox">
 
-  <TR>
-    <TH CLASS="background" COLSPAN=2 ALIGN="left">
-      <FONT SIZE="+1"><% mt('Customer search options') |h %></FONT>
-    </TH>
-  </TR>
+  <& /elements/tr-select-cust_tag.html,
+             'custnum' => $opt{'custnum'},
+  &>
 
   <& /elements/tr-select-agent.html,
                  'curr_value'    => scalar($cgi->param('agentnum')),
@@ -118,18 +134,16 @@ Examples:
        'pre_options'  => [ 0 => emt('(none)') ],
   &>
 
+  <& options_cust_location.html &>
+
 </TABLE>
 
 % if ( $table eq 'cust_pay' ) { 
 
   <BR>
-  <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
 
-  <TR>
-    <TH CLASS="background" COLSPAN=2 ALIGN="left">
-      <FONT SIZE="+1"><% mt('Display options') |h %></FONT>
-    </TH>
-  </TR>
+  <FONT CLASS="fsinnerbox-title"><% emt('Display options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
 
   <& /elements/tr-checkbox.html,
                 'label' => emt('Include tax names'),
@@ -137,6 +151,12 @@ Examples:
                 'value' => 1,
   &>
 
+  <& /elements/tr-checkbox.html,
+                'label' => emt('Include order number'),
+                'field' => 'show_order_number',
+                'value' => 1,
+  &>
+
 </TABLE>
 
 % }
@@ -166,6 +186,8 @@ my $title = $void ? "Voided $name_singular report" :
             "\u$name_singular report" ;
 $table .= '_void' if $void;
 
+my $has_reason = dbdef->table($table)->column('reasonnum');
+
 tie (my %payby, 'Tie::IxHash',
   'CARD-VisaMC'    => 'credit card (Visa/MasterCard)',
   'CARD-Amex'      => 'credit card (American Express)',
@@ -183,6 +205,7 @@ tie (my %payby, 'Tie::IxHash',
   'PREP'           => 'prepaid card',
   'WIRE'           => 'wire transfer',
   'WEST'           => 'Western Union',
+  'IDTP'           => 'IDT Payment Services',
   'EDI'            => 'Electronic Debit (EDI)',
   'MCRD'           => 'manual credit card',
   'MCHK'           => 'manual electronic check',