fix unapplied payment report, RT#73048, fallout from #25944

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

diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html
index 70727c0..1cc77f7 100644 (file)
--- a/httemplate/search/elements/report_cust_pay_or_refund.html
+++ b/httemplate/search/elements/report_cust_pay_or_refund.html
@@ -23,17 +23,17 @@ Examples:
 
   <TR>
     <TH CLASS="background" COLSPAN=2 ALIGN="left">
-      <FONT SIZE="+1"><% mt('Payment search options') |h %></FONT>
+      <FONT SIZE="+1"><% mt('[_1] search options', ucfirst($name_singular)) |h %></FONT>
     </TH>
   </TR>
 
   <& /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,
   &>
 
   <TR>
@@ -51,6 +51,20 @@ 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>
     <TD>
@@ -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',