X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-bill;h=49ad4a76890bb0b660e3caef57134803e0127e1e;hp=7898936c55d4165d3d9b72d626a1f0713274f050;hb=efccaa2d081bfcaaddcf9d89da3c2a065b4caafb;hpb=e4c4a600a9f167f84c1a0663f73797ed18934e92

diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 7898936c5..49ad4a768 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 $opt_p);
-getopts("acid:p");
+use vars qw($opt_a $opt_c $opt_d $opt_p);
+getopts("acd:p");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
@@ -59,14 +59,12 @@ foreach $cust_main (
 
   if ($opt_p) {
     $cust_main->apply_payments;
-    $error=$cust_main->apply_credits;
+    $cust_main->apply_credits;
   }
 
   if ($opt_c) {
-    $error=$cust_main->collect('invoice_time'=>$time,
-                               'batch_card' => $opt_i ? 'no' : 'yes',
-                              );
-    warn "Error collecting from customer #" . $cust_main->gcustnum.  ":$error"
+    $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,10 +93,12 @@ 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
 
+This script is deprecated in 1.4.0.  You should use freeside-daily instead.
+
 Bills customers.  Searches for customers who are due for billing and calls
 the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
@@ -110,9 +110,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.
 
@@ -121,15 +118,11 @@ user: From the mapsecrets file - see config.html from the base documentation
 custnum: if one or more customer numbers are specified, only bills those
 customers.  Otherwise, bills all customers.
 
-=head1 VERSION
-
-$Id: freeside-bill,v 1.10 2001-11-05 14:04:56 ivan Exp $
-
 =head1 BUGS
 
 =head1 SEE ALSO
 
-L<FS::cust_main>, config.html from the base documentation
+L<freeside-daily>, L<FS::cust_main>, config.html from the base documentation
 
 =cut