RT# 83082 - fixed so CC refunds cant go to batch

[freeside.git] / httemplate / edit / cust_refund.cgi

diff --git a/httemplate/edit/cust_refund.cgi b/httemplate/edit/cust_refund.cgi
index 32da454..bea3786 100755 (executable)
--- a/httemplate/edit/cust_refund.cgi
+++ b/httemplate/edit/cust_refund.cgi
@@ -33,7 +33,7 @@
 %    $paydate = '' unless ($paydate =~ /^\d{2,4}-\d{1,2}-01$'/);
 %  }
 
-  <BR>Payment
+  <BR><B>Payment</B>
   <% ntable("#cccccc", 2) %>
 
     <TR>
@@ -84,7 +84,7 @@
 % }  #if $cust_pay
 
 
-<BR>Refund
+<BR><B>Refund</B>
 <% ntable("#cccccc", 2) %>
 
   <TR>
@@ -94,14 +94,38 @@
 
   <TR>
     <TD ALIGN="right">Amount</TD>
-    <TD BGCOLOR="#ffffff">$<INPUT TYPE="text" NAME="refund" VALUE="<% $refund %>" SIZE=8 MAXLENGTH=9> by <B><% FS::payby->payname($payby) %></B></TD>
+    <TD BGCOLOR="#ffffff">$<INPUT TYPE="text" NAME="refund" VALUE="<% $refund %>" SIZE=8 MAXLENGTH=9></TD>
   </TR>
 
 % if ( $payby eq 'BILL' ) { 
     <TR>
-      <TD ALIGN="right">Check #</TD>
-      <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<% $payinfo %>" SIZE=10></TD>
+      <TD ALIGN="right">Check </TD>
+      <TD><INPUT TYPE="text" NAME="payinfo" VALUE="<% $payinfo %>" SIZE=10></TD>
     </TR>
+% }
+% elsif ($payby eq 'CHEK' || $payby eq 'CARD') {
+
+  <TR>
+    <TD ALIGN="right">Method</TD>
+    <TD BGCOLOR="#ffffff"><% FS::payby->payname($real_payby) %> # <% $real_paymask %></TD>
+  </TR>
+
+% if ($payby eq "CARD" || $payby eq "DCRD") {
+          <INPUT TYPE="hidden" NAME="batch" VALUE="">
+% }
+% elsif ( $conf->exists("batch-enable")
+%      || grep $payby eq $_, $conf->config('batch-enable_payby')
+% ) {
+%     if ( grep $payby eq $_, $conf->config('realtime-disable_payby') ) {
+          <INPUT TYPE="hidden" NAME="batch" VALUE="1">
+%     } else {
+        <TR>
+          <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="batch" VALUE="1" ID="batch" <% ($batchnum || $batch) ? 'checked' : '' %> ></TD>
+          <TD ALIGN="left">&nbsp;&nbsp;&nbsp;<% mt('Add to current batch') |h %></TD>
+        </TR>
+%     }
+%  }
+
 % } else {
     <INPUT TYPE="hidden" NAME="payinfo" VALUE="">
 % }
@@ -138,16 +162,18 @@ my $payby   = $cgi->param('payby');
 my $payinfo = $cgi->param('payinfo');
 my $reason  = $cgi->param('reason');
 my $link    = $cgi->param('popup') ? 'popup' : '';
+my $batch   = $cgi->param('batch');
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->refund_access_right($payby);
 
-my( $paynum, $cust_pay ) = ( '', '' );
+my( $paynum, $cust_pay, $batchnum ) = ( '', '', '' );
 if ( $cgi->param('paynum') =~ /^(\d+)$/ ) {
   $paynum = $1;
   $cust_pay = qsearchs('cust_pay', { paynum=>$paynum } )
     or die "unknown payment # $paynum";
   $refund ||= $cust_pay->unrefunded;
+  $batchnum = $cust_pay->batchnum;
   if ( $custnum ) {
     die "payment # $paynum is not for specified customer # $custnum"
       unless $custnum == $cust_pay->custnum;
@@ -157,6 +183,12 @@ if ( $cgi->param('paynum') =~ /^(\d+)$/ ) {
 }
 die "no custnum or paynum specified!" unless $custnum;
 
+my $cust_main = qsearchs( 'cust_main', { 'custnum'=>$custnum } );
+die "unknown custnum $custnum" unless $cust_main;
+
+my $real_payby = $cust_main->payby;
+my $real_paymask = $cust_main->paymask;
+
 my $_date = time;
 
 my $p1 = popurl(1);