projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d04e54b
)
consistency with un-voided payments wrt display
author
ivan
<ivan>
Thu, 1 Oct 2009 22:02:33 +0000
(22:02 +0000)
committer
ivan
<ivan>
Thu, 1 Oct 2009 22:02:33 +0000
(22:02 +0000)
httemplate/view/cust_main/payment_history/voided_payment.html
patch
|
blob
|
history
diff --git
a/httemplate/view/cust_main/payment_history/voided_payment.html
b/httemplate/view/cust_main/payment_history/voided_payment.html
index
08469db
..
4438613
100644
(file)
--- a/
httemplate/view/cust_main/payment_history/voided_payment.html
+++ b/
httemplate/view/cust_main/payment_history/voided_payment.html
@@
-8,15
+8,27
@@
my( $cust_pay_void, %opt ) = @_;
my $curuser = $FS::CurrentUser::CurrentUser;
my $payby = $cust_pay_void->payby;
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/^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/^BILL$//;
-$payby =~ s/^(CARD|COMP)$/$1 /;
-my $info = $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 } );
if ( $opt{'pkg-balances'} && $cust_pay_void->pkgnum ) {
my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_pay_void->pkgnum } );