X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-bill;h=6ef344a506cd4048fae05f5512408570db996177;hb=298b8d9a262265fe7106da1ff552ce6778237034;hp=82b3321e13eb19aa2ab861aa1e173bce0ef37e28;hpb=f5266a4d07d116efd732f433d0f4f3a47b143a7d;p=freeside.git

diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 82b3321e1..6ef344a50 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -11,8 +11,8 @@ use FS::Record qw(qsearch qsearchs);
 use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_a $opt_c $opt_i $opt_d);
-getopts("acid:");
+use vars qw($opt_a $opt_c $opt_d $opt_p);
+getopts("acd:p");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
@@ -22,7 +22,7 @@ my %bill_only = map { $_ => 1 } (
 );
 
 #we're at now now (and later).
-my($time)= $main::opt_d ? str2time($main::opt_d) : $^T;
+my($time)= $opt_d ? str2time($opt_d) : $^T;
 
 # find packages w/ bill < time && cancel != '', and create corresponding
 # customer objects
@@ -34,7 +34,7 @@ foreach $cust_main (
       $saw{ $_->custnum } = 0; # to avoid 'use of uninitialized value' errors
     }
     if (
-      ( $main::opt_a || ( ( $_->getfield('bill') || 0 ) <= $time ) )
+      ( $opt_a || ( ( $_->getfield('bill') || 0 ) <= $time ) )
       && $bill_only{ $_->custnum }
       && !$saw{ $_->custnum }++
     ) {
@@ -57,16 +57,14 @@ foreach $cust_main (
   warn "Error billing,  customer #" . $cust_main->getfield('custnum') . 
     ":" . $error if $error;
 
-  if ($main::opt_p) {
+  if ($opt_p) {
     $cust_main->apply_payments;
-    $error=$cust_main->apply_credits;
+    $cust_main->apply_credits;
   }
 
-  if ($main::opt_c) {
-    $error=$cust_main->collect('invoice_time'=>$time,
-                               'batch_card' => $main::opt_i ? 'no' : 'yes',
-                              );
-    warn "Error collecting from customer #" . $cust_main->gcustnum.  ":$error"
+  if ($opt_c) {
+    $error=$cust_main->collect( 'invoice_time' => $time);
+    warn "Error collecting from customer #" . $cust_main->custnum.  ":$error"
       if $error;
 
     #sleep 1;
@@ -86,7 +84,7 @@ sub untaint_argv {
 }
 
 sub usage {
-  die "Usage:\n\n  freeside-bill [ -c [ i ] ] [ -d 'date' ] [ -b ] user\n";
+  die "Usage:\n\n  freeside-bill [ -c [ -p ] ] [ -d 'date' ] user [ custnum custnum ... ]\n";
 }
 
 =head1 NAME
@@ -95,7 +93,7 @@ freeside-bill - Command line (crontab, script) interface to customer billing.
 
 =head1 SYNOPSIS
 
-  freeside-bill [ -c [ -p ] [ -a ] [ -i ] ] [ -d 'date' ] user [ custnum custnum ... ]
+  freeside-bill [ -c [ -p ] [ -a ] ] [ -d 'date' ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -110,9 +108,6 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
   -a: Call collect even if there isn't a new invoice (probably a bad idea for
       daily use)
 
-  -i: real-time billing (as opposed to batch billing).  only relevant
-      for credit cards.
-
   -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
       but be careful.
 
@@ -123,7 +118,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.9 2001-09-11 00:08:18 ivan Exp $
+$Id: freeside-bill,v 1.12 2002-02-10 01:48:00 ivan Exp $
 
 =head1 BUGS