X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fprepay_credit.pm;h=a0fd7f9a3a34d986826898ac566b8a5837128880;hp=92f2a303247f3d8d852107a77ee03894d37dd177;hb=f822e27a1e00594332ffa487a1c284234c5580a6;hpb=673b9a458d9138523026963df6fa3b4683e09bae

diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
index 92f2a3032..a0fd7f9a3 100644
--- a/FS/FS/prepay_credit.pm
+++ b/FS/FS/prepay_credit.pm
@@ -1,11 +1,12 @@
 package FS::prepay_credit;
+use base qw(FS::Record);
 
 use strict;
-use vars qw( @ISA );
+use vars qw( $DEBUG $me );
 use FS::Record qw(qsearchs dbh);
-use FS::agent;
 
-@ISA = qw(FS::Record);
+$DEBUG = 0;
+$me = '[FS::prepay_credit]';
 
 =head1 NAME
 
@@ -61,7 +62,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
@@ -110,6 +111,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
   ;
@@ -120,20 +124,13 @@ sub check {
 
 Returns the agent (see L<FS::agent>) for this prepaid card, if any.
 
-=cut
-
-sub agent {
-  my $self = shift;
-  qsearchs('agent', { 'agentnum' => $self->agentnum } );
-}
-
 =back
 
 =head1 SUBROUTINES
 
 =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 +139,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 +157,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;