[freeside-commits] freeside/FS/FS payinfo_Mixin.pm, 1.5.2.1, 1.5.2.2

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	payinfo_Mixin.pm 
Log Message:
fix for using new payment duplicate stuff with cc encryption

Index: payinfo_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/payinfo_Mixin.pm,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- payinfo_Mixin.pm	1 Mar 2008 23:30:06 -0000	1.5.2.1
+++ payinfo_Mixin.pm	5 May 2008 01:18:48 -0000	1.5.2.2
@@ -216,7 +216,7 @@
   FS::payby->can_payby($self->table, $self->payby)
     or return "Illegal payby: ". $self->payby;
 
-  if ( $self->payby eq 'CARD' ) {
+  if ( $self->payby eq 'CARD' && ! $self->is_encrypted($self->payinfo) ) {
     my $payinfo = $self->payinfo;
     $payinfo =~ s/\D//g;
     $self->payinfo($payinfo);
@@ -227,7 +227,7 @@
       validate($self->payinfo) or return "Illegal credit card number";
       return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
     } else {
-      $self->payinfo('N/A');
+      $self->payinfo('N/A'); #???
     }
   } else {
     my $error = $self->ut_textn('payinfo');