X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpayinfo_Mixin.pm;h=d03391f6806cfe66ee9219be382a54d787a8d3f0;hb=573139dbd6c37808697bfa72a3a468bb0980d4dd;hp=9995183d803941c8cb764353eb9d9365d2b0f173;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index 9995183d8..d03391f68 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -132,34 +132,47 @@ sub mask_payinfo {
   my $payinfo = scalar(@_) ? shift : $self->payinfo;
 
   # Check to see if it's encrypted...
-  my $paymask;
   if ( $self->is_encrypted($payinfo) ) {
-    $paymask = 'N/A';
+    return 'N/A';
   } 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') {
+
       # 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);
 
-      $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' ) {
+
       # 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)).
+             ( length($aba) ? "@".$aba : '');
+
     } else { # Tie up loose ends
-      $paymask = $payinfo;
+      return $payinfo;
     }
   }
-  $paymask;
+  #die "shouldn't be reached";
 }
 
 =item payinfo_check
@@ -196,7 +209,7 @@ sub payinfo_check {
     $payinfo =~ s/\D//g;
     $self->payinfo($payinfo);
     if ( $self->payinfo ) {
-      $self->payinfo =~ /^(\d{13,16})$/
+      $self->payinfo =~ /^(\d{13,16}|\d{8,9})$/
         or return "Illegal (mistyped?) credit card number (payinfo)";
       $self->payinfo($1);
       validate($self->payinfo) or return "Illegal credit card number";