X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Freport_cust_pay_or_refund.html;h=f7a81a066c8a56c353f11359661a1bcf54718a13;hp=a25e696438e8936e78127115f5f9557d9847feed;hb=HEAD;hpb=bc6770012b72baee61e86c54e959ac8ee234ff86

diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html
index a25e69643..f7a81a066 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('[_1] search options', ucfirst($name_singular)) |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>
@@ -66,7 +69,7 @@ Examples:
 % }
 
   <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,
@@ -79,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,
@@ -111,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')),
@@ -132,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'),
@@ -151,6 +151,12 @@ Examples:
                 'value' => 1,
   &>
 
+  <& /elements/tr-checkbox.html,
+                'label' => emt('Include order number'),
+                'field' => 'show_order_number',
+                'value' => 1,
+  &>
+
 </TABLE>
 
 % }
@@ -168,7 +174,7 @@ my $table = 'cust_'.$opt{'thing'};
 my $name_singular = $opt{'name_singular'};
 
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
+  unless $FS::CurrentUser::CurrentUser->access_right('Basic payment and refund reports');
 
 my $conf = new FS::Conf;
 
@@ -199,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',