projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8e56220
)
add support for Isracards w/Business::OnlinePayment 0.32_01+, RT#13529
author
ivan
<ivan>
Tue, 12 Jul 2011 03:54:06 +0000
(
03:54
+0000)
committer
ivan
<ivan>
Tue, 12 Jul 2011 03:54:06 +0000
(
03:54
+0000)
FS/FS/payinfo_Mixin.pm
patch
|
blob
|
history
diff --git
a/FS/FS/payinfo_Mixin.pm
b/FS/FS/payinfo_Mixin.pm
index
83425dd
..
84264c9
100644
(file)
--- a/
FS/FS/payinfo_Mixin.pm
+++ b/
FS/FS/payinfo_Mixin.pm
@@
-132,34
+132,46
@@
sub mask_payinfo {
my $payinfo = scalar(@_) ? shift : $self->payinfo;
# Check to see if it's encrypted...
my $payinfo = scalar(@_) ? shift : $self->payinfo;
# Check to see if it's encrypted...
- my $paymask;
if ( $self->is_encrypted($payinfo) ) {
if ( $self->is_encrypted($payinfo) ) {
-
$paymask =
'N/A';
+
return
'N/A';
} elsif ( $payinfo =~ /^99\d{14}$/ || $payinfo eq 'N/A' ) { #token
} elsif ( $payinfo =~ /^99\d{14}$/ || $payinfo eq 'N/A' ) { #token
-
$paymask =
'N/A (tokenized)'; #?
- } else {
- # if not, mask it...
+
return
'N/A (tokenized)'; #?
+ } else {
# if not, mask it...
+
if ($payby eq 'CARD' || $payby eq 'DCRD' || $payby eq 'MCRD') {
if ($payby eq 'CARD' || $payby eq 'DCRD' || $payby eq 'MCRD') {
+
# Credit Cards
# Credit Cards
+
+ # special handling for Local Isracards: always show last 4
+ if ( $payinfo =~ /^(\d{8,9})$/ ) {
+
+ return 'x'x(length($payinfo)-4).
+ substr($payinfo,(length($payinfo)-4));
+
+ }
+
my $conf = new FS::Conf;
my $mask_method = $conf->config('card_masking_method') || 'first6last4';
$mask_method =~ /^first(\d+)last(\d+)$/
or die "can't parse card_masking_method $mask_method";
my($first, $last) = ($1, $2);
my $conf = new FS::Conf;
my $mask_method = $conf->config('card_masking_method') || 'first6last4';
$mask_method =~ /^first(\d+)last(\d+)$/
or die "can't parse card_masking_method $mask_method";
my($first, $last) = ($1, $2);
- $paymask = substr($payinfo,0,$first).
- 'x'x(length($payinfo)-$first-$last).
- substr($payinfo,(length($payinfo)-$last));
+ return substr($payinfo,0,$first).
+ 'x'x(length($payinfo)-$first-$last).
+ substr($payinfo,(length($payinfo)-$last));
+
} elsif ($payby eq 'CHEK' || $payby eq 'DCHK' ) {
} elsif ($payby eq 'CHEK' || $payby eq 'DCHK' ) {
+
# Checks (Show last 2 @ bank)
my( $account, $aba ) = split('@', $payinfo );
# Checks (Show last 2 @ bank)
my( $account, $aba ) = split('@', $payinfo );
- $paymask = 'x'x(length($account)-2).
- substr($account,(length($account)-2))."@".$aba;
+ return 'x'x(length($account)-2).
+ substr($account,(length($account)-2))."@".$aba;
+
} else { # Tie up loose ends
} else { # Tie up loose ends
-
$paymask =
$payinfo;
+
return
$payinfo;
}
}
}
}
-
$paymask
;
+
#die "shouldn't be reached"
;
}
=item payinfo_check
}
=item payinfo_check