X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history%2Fvoided_payment.html;h=0a8cd107766fc447533095ca72816d7f5270ebfc;hb=170aa1e8078280e7c03a6ebfc67280de66fa1b9d;hp=08469dbe915b6341fd42d88c49873225beb08eed;hpb=4396080ed2829ae0595f1fd777f39d090c9bcd7c;p=freeside.git

diff --git a/httemplate/view/cust_main/payment_history/voided_payment.html b/httemplate/view/cust_main/payment_history/voided_payment.html
index 08469dbe9..0a8cd1077 100644
--- a/httemplate/view/cust_main/payment_history/voided_payment.html
+++ b/httemplate/view/cust_main/payment_history/voided_payment.html
@@ -1,22 +1,32 @@
-<DEL>Payment <% $info %></DEL>
-<I>voided <% time2str("%D", $cust_pay_void->void_date) %>
-by <% $cust_pay_void->otaker %></I><% $unvoid %>
+<DEL><% mt("Payment [_1] by [_2]", $info, $cust_pay_void->otaker ) |h %></DEL>
+<I><% mt("voided [_1]", time2str($date_format, $cust_pay_void->void_date) ) |h %> 
+% my $void_user = $cust_pay_void->void_access_user;
+% if ($void_user) {
+    by <% $void_user->username %></I>
+% }
+<% $unvoid %>
 <%init>
 
 my( $cust_pay_void, %opt ) = @_;
 
+my $date_format = $opt{'date_format'} || '%m/%d/%Y';
+
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 my $payby = $cust_pay_void->payby;
-my $payinfo = $payby eq 'CARD'
-                ? $cust_pay_void->paymask
-                : $cust_pay_void->payinfo;
 
-$payby =~ s/^BILL$/Check #/ if $payinfo;
-$payby =~ s/^CHEK$/Electronic check /;
-$payby =~ s/^BILL$//;
-$payby =~ s/^(CARD|COMP)$/$1 /;
-my $info = $payby ? " ($payby$payinfo)" : '';
+my $payinfo;
+if ( $payby eq 'CARD' ) {
+  $payinfo = $cust_pay_void->paymask;
+} elsif ( $payby eq 'CHEK' ) {
+  my( $account, $aba ) = split('@', $cust_pay_void->paymask );
+  $payinfo = mt("ABA [_1], Acct #[_2]",$aba,$account);
+} else {
+  $payinfo = $cust_pay_void->payinfo;
+}
+
+$payby = translate_payby($payby,$payinfo);
+my $info = $payby ? "($payby$payinfo)" : '';
 
 if ( $opt{'pkg-balances'} && $cust_pay_void->pkgnum ) {
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_pay_void->pkgnum } );
@@ -31,12 +41,12 @@ if ( $cust_pay_void->closed !~ /^Y/i
   $unvoid = qq! (<A HREF="javascript:areyousure('!.
             qq!${p}misc/unvoid-cust_pay_void.cgi?!. $cust_pay_void->paynum.
             qq!', 'Are you sure you want to unvoid this payment?')"!.
-            qq! TITLE="Unvoid this payment from the database!.
+            qq! TITLE="!.mt('Unvoid this payment from the database').
               ( $cust_pay_void->payby =~ /^(CARD|CHEK)$/
-                ? ' (do not send anything to the payment gateway)'
+                ? ' ('.mt('do not send anything to the payment gateway') .')'
                 : '' 
               ). '"'.
-            qq!>unvoid</A>)!;
+            '>'.mt('unvoid').'</A>)';
 }
 
 </%init>