[freeside-commits] freeside/FS/FS cust_main.pm,1.547,1.548

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv29044

Modified Files:
	cust_main.pm 
Log Message:
cust_main otaker upgrade vs banned cards

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -w -d -r1.547 -r1.548
--- cust_main.pm	18 Sep 2010 03:49:07 -0000	1.547
+++ cust_main.pm	18 Sep 2010 04:26:17 -0000	1.548
@@ -8,7 +8,8 @@
            );
 use vars qw( $DEBUG $me $conf
              @encrypted_fields
-             $import $ignore_expired_card $ignore_illegal_zip
+             $import
+             $ignore_expired_card $ignore_illegal_zip $ignore_banned_card
              $skip_fuzzyfiles @fuzzyfields
              @paytypes
            );
@@ -76,6 +77,7 @@
 $import = 0;
 $ignore_expired_card = 0;
 $ignore_illegal_zip = 0;
+$ignore_banned_card = 0;
 
 $skip_fuzzyfiles = 0;
 @fuzzyfields = ( 'first', 'last', 'company', 'address1' );
@@ -1922,6 +1924,7 @@
       if $self->payinfo !~ /^99\d{14}$/ #token
       && cardtype($self->payinfo) eq "Unknown";
 
+    unless ( $ignore_banned_card ) {
     my $ban = qsearchs('banned_pay', $self->_banned_pay_hashref);
     if ( $ban ) {
       return 'Banned credit card: banned on '.
@@ -1929,6 +1932,7 @@
              ' by '. $ban->otaker.
              ' (ban# '. $ban->bannum. ')';
     }
+    }
 
     if (length($self->paycvv) && !$self->is_encrypted($self->paycvv)) {
       if ( cardtype($self->payinfo) eq 'American Express card' ) {
@@ -5546,7 +5550,8 @@
 
   local($ignore_expired_card) = 1;
   local($ignore_illegal_zip) = 1;
-  local($skip_fuzzyfiles) = 1;
+  local($ignore_illegal_zip) = 1;
+  local($ignore_banned_card) = 1;
   $class->_upgrade_otaker(%opts);
 
 }