communigate (phase 2): rules. RT#7514

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

diff --git a/httemplate/edit/cust_refund.cgi b/httemplate/edit/cust_refund.cgi
index 94c0993..59417b4 100755 (executable)
--- a/httemplate/edit/cust_refund.cgi
+++ b/httemplate/edit/cust_refund.cgi
@@ -41,14 +41,14 @@
     </TR>
 
   <TR>
-    <TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff"><% time2str("%D",$cust_pay->_date) %></TD>
+    <TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff"><% time2str($date_format, $cust_pay->_date) %></TD>
   </TR>
 
   <TR>
     <TD ALIGN="right">Method</TD><TD BGCOLOR="#ffffff"><% $payby %> # <% $paymask %></TD>
   </TR>
 
-% unless ( $paydate ) {  # possibly other reasons: i.e. card has since expired
+% unless ( $paydate || $cust_pay->payby ne 'CARD' ) {  # possibly other reasons: i.e. card has since expired
   <TR>
     <TD ALIGN="right">Expiration</TD><TD BGCOLOR="#ffffff">
       <% include( '/elements/select-month_year.html',
@@ -93,7 +93,7 @@
 
   <TR>
     <TD ALIGN="right">Date</TD>
-    <TD BGCOLOR="#ffffff"><% time2str("%D",$_date) %></TD>
+    <TD BGCOLOR="#ffffff"><% time2str($date_format, $_date) %></TD>
   </TR>
 
   <TR>
@@ -134,6 +134,8 @@ die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Refund payment');
 
 my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
 my $custnum = $cgi->param('custnum');
 my $refund  = $cgi->param('refund');
 my $payby   = $cgi->param('payby');