+#!/usr/bin/perl -w
+# don't take any world-facing input
#!/usr/bin/perl -Tw
use strict;
use Fcntl qw(:flock);
use Date::Parse;
use Getopt::Std;
-use FS::UID qw(adminsuidsetup swapuid);
+use FS::UID qw(adminsuidsetup);
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_i $opt_d $opt_p);
+getopts("acid:p");
my $user = shift or die &usage;
adminsuidsetup $user;
);
#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
my($cust_main,%saw);
foreach $cust_main (
map {
+ unless ( exists $saw{ $_->custnum } && defined $saw{ $_->custnum} ) {
+ $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 }++
) {
# and bill them
print "Billing customer #" . $cust_main->getfield('custnum') . "\n";
- next;
my($error);
warn "Error billing, customer #" . $cust_main->getfield('custnum') .
":" . $error if $error;
- if ($main::opt_c) {
+ if ($opt_p) {
+ $cust_main->apply_payments;
+ $error=$cust_main->apply_credits;
+ }
+
+ if ($opt_c) {
$error=$cust_main->collect('invoice_time'=>$time,
- 'batch_card' => $main::opt_i ? 'no' : 'yes',
+ 'batch_card' => $opt_i ? 'no' : 'yes',
);
- warn "Error collecting customer #" . $cust_main->getfield('custnum') .
- ":" . $error if $error;
-
- #sleep 1;
+ warn "Error collecting from customer #" . $cust_main->gcustnum. ":$error"
+ if $error;
+ #sleep 1;
}
}
sub untaint_argv {
foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
- $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+ #$ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+ # Date::Parse
+ $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
$ARGV[$_]=$1;
}
}
sub usage {
- die "Usage:\n\n bill [ -c [ i ] ] [ -d 'date' ] [ -b ] user\n";
+ die "Usage:\n\n freeside-bill [ -c [ i ] ] [ -d 'date' ] [ -b ] user\n";
}
=head1 NAME
=head1 SYNOPSIS
- freeside-bill [ -c [ -a ] [ -i ] ] [ -d 'date' ] user [ custnum custnum ... ]
+ freeside-bill [ -c [ -p ] [ -a ] [ -i ] ] [ -d 'date' ] user [ custnum custnum ... ]
=head1 DESCRIPTION
-c: Turn on collecting (you probably want this).
+ -p: Apply unapplied payments and credits before collecting (you probably want
+ this too)
+
-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: Pretent it's 'date'. Date is in any format Date::Parse is happy with,
+ -d: Pretend it's 'date'. Date is in any format Date::Parse is happy with,
but be careful.
user: From the mapsecrets file - see config.html from the base documentation
=head1 VERSION
-$Id: freeside-bill,v 1.1 1999-08-11 20:41:27 ivan Exp $
+$Id: freeside-bill,v 1.10 2001-11-05 14:04:56 ivan Exp $
=head1 BUGS