[freeside-commits] freeside/httemplate/view/cust_main/payment_history voided_payment.html, 1.1.2.2, 1.1.2.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history
In directory wavetail.420.am:/tmp/cvs-serv22551

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	voided_payment.html 
Log Message:
consistency with un-voided payments wrt display

Index: voided_payment.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/voided_payment.html,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- voided_payment.html	1 Jun 2008 22:48:58 -0000	1.1.2.2
+++ voided_payment.html	1 Oct 2009 22:02:03 -0000	1.1.2.3
@@ -8,15 +8,27 @@
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 my $payby = $cust_pay_void->payby;
-my $payinfo = $payby eq 'CARD'
-                ? $cust_pay_void->paymask
-                : $cust_pay_void->payinfo;
+
+my $payinfo;
+if ( $payby eq 'CARD' ) {
+  $payinfo = $cust_pay->paymask;
+} elsif ( $payby eq 'CHEK' ) {
+  my( $account, $aba ) = split('@', $cust_pay->paymask );
+  $payinfo = "ABA $aba, Acct #$account";
+} else {
+  $payinfo = $cust_pay->payinfo;
+}
 
 $payby =~ s/^BILL$/Check #/ if $payinfo;
 $payby =~ s/^CHEK$/Electronic check /;
+$payby =~ s/^PREP$/Prepaid card /;
+$payby =~ s/^CARD$/Credit card #/; 
+$payby =~ s/^COMP$/Complimentary by /; 
+$payby =~ s/^CASH$/Cash/;
+$payby =~ s/^WEST$/Western Union/;
+$payby =~ s/^MCRD$/Manual credit card/;
 $payby =~ s/^BILL$//;
-$payby =~ s/^(CARD|COMP)$/$1 /;
-my $info = $payby ? " ($payby$payinfo)" : '';
+my $info = $payby ? "($payby$payinfo)" : '';
 
 my $unvoid = '';
 if ( $cust_pay_void->closed !~ /^Y/i