X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-bill;h=49ec43c82cbd2f5b1f2df546a30785391053b972;hb=5e25b996982d42eb2587ec54db0d5b39508aa730;hp=680d29da5b8064d15b3ead14d362f1ed6a82fbcc;hpb=27649e60bc8cf16ba2f76731a4ebab471df3801c;p=freeside.git

diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 680d29da5..49ec43c82 100755
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -1,16 +1,18 @@
+#!/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;
@@ -20,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
@@ -32,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 }++
     ) {
@@ -55,15 +57,19 @@ foreach $cust_main (
   warn "Error billing,  customer #" . $cust_main->getfield('custnum') . 
     ":" . $error if $error;
 
-  if ($main::opt_c) {
+  if ($opt_p) {
+    $cust_main->apply_payments;
+    $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->custnum.  ":$error"
+      if $error;
 
+    #sleep 1;
   }
 
 }
@@ -80,7 +86,7 @@ sub untaint_argv {
 }
 
 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
@@ -89,7 +95,7 @@ freeside-bill - Command line (crontab, script) interface to customer billing.
 
 =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
 
@@ -98,6 +104,9 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -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)
 
@@ -114,7 +123,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
-$Id: freeside-bill,v 1.5 2000-06-22 10:52:37 ivan Exp $
+$Id: freeside-bill,v 1.11 2001-12-28 14:40:35 ivan Exp $
 
 =head1 BUGS