diff options
| -rwxr-xr-x | FS/bin/freeside-bill | 17 | ||||
| -rw-r--r-- | README.1.4.0pre8 | 3 | ||||
| -rw-r--r-- | httemplate/docs/upgrade8.html | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill index 49ec43c82..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 $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; @@ -63,9 +63,7 @@ foreach $cust_main ( } if ($opt_c) { - $error=$cust_main->collect('invoice_time'=>$time, - 'batch_card' => $opt_i ? 'no' : 'yes', - ); + $error=$cust_main->collect( 'invoice_time' => $time); warn "Error collecting from customer #" . $cust_main->custnum. ":$error" if $error; @@ -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.11 2001-12-28 14:40:35 ivan Exp $ +$Id: freeside-bill,v 1.12 2002-02-10 01:48:00 ivan Exp $ =head1 BUGS diff --git a/README.1.4.0pre8 b/README.1.4.0pre8 index 6872bdd60..4eccb203e 100644 --- a/README.1.4.0pre8 +++ b/README.1.4.0pre8 @@ -69,5 +69,6 @@ Go to the new "View/Edit Invoice events" in the web interface and add the appropriate events. t the very least, you'll want to set some invoice events "After 0 days": a BILL invoice event to print invoices, a CARD invoice event to batch or run cards real-time, and a COMP invoice event to "pay" complimentary -customers. +customers. If you were using the -i option to freeside-bill it should be +removed. diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html index 0949315b9..b243eba75 100644 --- a/httemplate/docs/upgrade8.html +++ b/httemplate/docs/upgrade8.html @@ -299,6 +299,6 @@ ALTER TABLE cust_refund DROP COLUMN crednum; <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory (ownded by the freeside user). <li>freeside-queued was installed with the Perl modules. Start it now and ensure that is run upon system startup. - <li>Set appropriate <a href="../browse/part_bill_event.cgi">invoice events</a> for your site. At the very least, you'll want to set some invoice events "<i>After 0 days</i>": a <i>BILL</i> invoice event to print invoices, a <i>CARD</i> invoice event to batch or run cards real-time, and a <i>COMP</i> invoice event to "pay" complimentary customers. + <li>Set appropriate <a href="../browse/part_bill_event.cgi">invoice events</a> for your site. At the very least, you'll want to set some invoice events "<i>After 0 days</i>": a <i>BILL</i> invoice event to print invoices, a <i>CARD</i> invoice event to batch or run cards real-time, and a <i>COMP</i> invoice event to "pay" complimentary customers. If you were using the <i>-i</i> option to <a href="man/bin/freeside-bill.html">freeside-bill</a> it should be removed. </ul> </body> |