X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fprepay_credit.pm;h=c93999c6dffa07c4435d8be568066d916ce79aa6;hp=38e87ad919150c47e719ad2726fbf55749b5b56a;hb=395cc72629d31c8dcd138acf423e66d2d73d89d2;hpb=c8cccb4a92adceb943c635fe62dad0d034462ce0

diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
index 38e87ad91..c93999c6d 100644
--- a/FS/FS/prepay_credit.pm
+++ b/FS/FS/prepay_credit.pm
@@ -1,12 +1,15 @@
 package FS::prepay_credit;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $DEBUG $me );
 use FS::Record qw(qsearchs dbh);
 use FS::agent;
 
 @ISA = qw(FS::Record);
 
+$DEBUG = 0;
+$me = '[FS::prepay_credit]';
+
 =head1 NAME
 
 FS::prepay_credit - Object methods for prepay_credit records
@@ -110,6 +113,9 @@ sub check {
   || $self->ut_alpha('identifier')
   || $self->ut_money('amount')
   || $self->ut_numbern('seconds')
+  || $self->ut_numbern('upbytes')
+  || $self->ut_numbern('downbytes')
+  || $self->ut_numbern('totalbytes')
   || $self->ut_foreign_keyn('agentnum', 'agent', 'agentnum')
   || $self->SUPER::check
   ;
@@ -133,7 +139,7 @@ sub agent {
 
 =over 4
 
-=item generate NUM TYPE HASHREF
+=item generate NUM TYPE LENGTH HASHREF
 
 Generates the specified number of prepaid cards.  Returns an array reference of
 the newly generated card identifiers, or a scalar error message.
@@ -142,11 +148,12 @@ the newly generated card identifiers, or a scalar error message.
 
 #false laziness w/agent::generate_reg_codes
 sub generate {
-  my( $num, $type, $hashref ) = @_;
+  my( $num, $type, $length, $hashref ) = @_;
 
   my @codeset = ();
   push @codeset, ( 'A'..'Z' ) if $type =~ /alpha/;
   push @codeset, ( '1'..'9' ) if $type =~ /numeric/;
+  $length ||= 8;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -159,10 +166,27 @@ sub generate {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  my $condup = 0; #don't retry forever
+  
   my @cards = ();
   for ( 1 ... $num ) {
+
+    my $identifier = join('', map($codeset[int(rand $#codeset)], (1..$length) ) );
+
+    if ( qsearchs('prepay_credit',{identifier=>$identifier}) ) {
+      if ( $condup++ < 54 ) {
+        warn "$me generate: duplicate identifier $identifier; retrying\n"
+          if $DEBUG;
+        redo;
+      } else {
+        warn "$me generate: giving up after 54 tries"
+          if $DEBUG;
+      }
+    }
+    $condup = 0;
+
     my $prepay_credit = new FS::prepay_credit {
-      'identifier' => join('', map($codeset[int(rand $#codeset)], (0..7) ) ),
+      'identifier' => $identifier,
       %$hashref,
     };
     my $error = $prepay_credit->check || $prepay_credit->insert;