X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fprepay_credit.pm;h=e5773aebd54ce679135c728a201e21d45feeebad;hb=74e058c8a010ef6feb539248a550d0bb169c1e94;hp=cffedeb0fa748ebf720b1f8983bd1073bbe86a7d;hpb=b5fbaadb1cb2893660e460a1d4a3cabe02774de7;p=freeside.git

diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
index cffedeb0f..e5773aebd 100644
--- a/FS/FS/prepay_credit.pm
+++ b/FS/FS/prepay_credit.pm
@@ -51,6 +51,8 @@ fields are currently supported:
 
 =item seconds - time amount of credit (see L<FS::svc_acct/seconds>)
 
+=item agentnum - optional agent (see L<FS::agent>) for this prepaid card
+
 =back
 
 =head1 METHODS
@@ -59,7 +61,7 @@ fields are currently supported:
 
 =item new HASHREF
 
-Creates a new pre-paid credit.  To add the example to the database, see
+Creates a new pre-paid credit.  To add the pre-paid credit to the database, see
 L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
@@ -108,6 +110,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
   ;
@@ -131,7 +136,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.
@@ -140,11 +145,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';
@@ -157,10 +163,18 @@ 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) ) );
+
+    redo if qsearchs('prepay_credit',{identifier=>$identifier}) && $condup++<23;
+    $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;