value issues and many bits remain

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index c2a39af..8a05fcf 100644 (file)
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1286,10 +1286,11 @@ sub batch_card {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 

-  my $pay_batch = qsearchs('pay_batch'=> '');
+  my $pay_batch = qsearchs('pay_batch', {'status' => 'O'});

 
   unless ($pay_batch) {
     $pay_batch = new FS::pay_batch;
 
   unless ($pay_batch) {
     $pay_batch = new FS::pay_batch;

+    $pay_batch->setfield('status' => 'O');

     my $error = $pay_batch->insert;
     if ( $error ) {
       die "error creating new batch: $error\n";
     my $error = $pay_batch->insert;
     if ( $error ) {
       die "error creating new batch: $error\n";

diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
index 192c5df..41b312c 100644 (file)
--- a/FS/FS/pay_batch.pm
+++ b/FS/FS/pay_batch.pm
@@ -98,7 +98,7 @@ sub check {
 
   my $error = 
     $self->ut_numbern('batchnum')
 
   my $error = 
     $self->ut_numbern('batchnum')

-    || $self->ut_enum('status', [ '', 'I', 'R' ])
+    || $self->ut_enum('status', [ 'O', 'I', 'R' ])

   ;
   return $error if $error;
 
   ;
   return $error if $error;
 

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 2d6f8a2..6172b13 100644 (file)
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -16,7 +16,7 @@ my $oldAutoCommit = $FS::UID::AutoCommit;
 local $FS::UID::AutoCommit = 0;
 my $dbh = dbh;
 
 local $FS::UID::AutoCommit = 0;
 my $dbh = dbh;
 

-my $pay_batch = qsearchs('pay_batch', {'status'=>''} );
+my $pay_batch = qsearchs('pay_batch', {'status'=>'O'} );

 die "No pending batch. \n" unless $pay_batch;
 
 my %batchhash = $pay_batch->hash;
 die "No pending batch. \n" unless $pay_batch;
 
 my %batchhash = $pay_batch->hash;