fix more bugs

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 2ca4b52..f61137f 100644 (file)
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -408,7 +408,7 @@ sub print_text {
 
     push @buf,[
       "Payment received ". time2str("%x",$_->cust_pay->_date ),
 
     push @buf,[
       "Payment received ". time2str("%x",$_->cust_pay->_date ),

-      $money_char. sprintf("%10.2f",$_->paid )
+      $money_char. sprintf("%10.2f",$_->amount )

     ];
   }
 
     ];
   }
 


@@ -489,7 +489,7 @@ sub print_text {
 
 =head1 VERSION
 
 
 =head1 VERSION
 

-$Id: cust_bill.pm,v 1.10 2001-09-02 01:27:10 ivan Exp $
+$Id: cust_bill.pm,v 1.11 2001-09-03 22:07:38 ivan Exp $

 
 =head1 BUGS
 
 
 =head1 BUGS
 

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 921c025..5ef82d6 100644 (file)
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -114,7 +114,7 @@ sub insert {
   if ( $bill_total > $cust_bill->charged ) {
     $dbh->rollback if $oldAutoCommit;
     return "total cust_bill_pay.amount and cust_credit_bill.amount $bill_total".
   if ( $bill_total > $cust_bill->charged ) {
     $dbh->rollback if $oldAutoCommit;
     return "total cust_bill_pay.amount and cust_credit_bill.amount $bill_total".

-           "for invnum ". $self->invnum.
+           " for invnum ". $self->invnum.

            " greater than cust_bill.charged ". $cust_bill->charged;
   }
 
            " greater than cust_bill.charged ". $cust_bill->charged;
   }
 


@@ -195,7 +195,7 @@ sub cust_bill {
 
 =head1 VERSION
 
 
 =head1 VERSION
 

-$Id: cust_bill_pay.pm,v 1.7 2001-09-02 07:49:52 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.8 2001-09-03 22:07:38 ivan Exp $

 
 =head1 BUGS
 
 
 =head1 BUGS
 

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 41ad21b..b29e385 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -709,10 +709,16 @@ sub ncancelled_pkgs {
 Generates invoices (see L<FS::cust_bill>) for this customer.  Usually used in
 conjunction with the collect method.
 
 Generates invoices (see L<FS::cust_bill>) for this customer.  Usually used in
 conjunction with the collect method.
 

+Options are passed as name-value pairs.
+

 The only currently available option is `time', which bills the customer as if
 it were that time.  It is specified as a UNIX timestamp; see
 L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion
 The only currently available option is `time', which bills the customer as if
 it were that time.  It is specified as a UNIX timestamp; see
 L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion

-functions.
+functions.  For example:
+
+ use Date::Parse;
+ ...
+ $cust_main->bill( 'time' => str2time('April 20th, 2001') );

 
 If there is an error, returns the error, otherwise returns false.
 
 
 If there is an error, returns the error, otherwise returns false.
 


@@ -740,7 +746,7 @@ sub bill {
   # & generate invoice database.
  
   my( $total_setup, $total_recur ) = ( 0, 0 );
   # & generate invoice database.
  
   my( $total_setup, $total_recur ) = ( 0, 0 );

-  my @cust_bill_pkg;
+  my @cust_bill_pkg = ();

 
   foreach my $cust_pkg (
     qsearch('cust_pkg',{'custnum'=> $self->getfield('custnum') } )
 
   foreach my $cust_pkg (
     qsearch('cust_pkg',{'custnum'=> $self->getfield('custnum') } )


@@ -763,20 +769,24 @@ sub bill {
     my $setup = 0;
     unless ( $cust_pkg->setup ) {
       my $setup_prog = $part_pkg->getfield('setup');
     my $setup = 0;
     unless ( $cust_pkg->setup ) {
       my $setup_prog = $part_pkg->getfield('setup');

-      $setup_prog =~ /^(.*)$/ #presumably trusted
-        or die "Illegal setup for package ". $cust_pkg->pkgnum. ": $setup_prog";
+      $setup_prog =~ /^(.*)$/ or do {
+        $dbh->rollback if $oldAutoCommit;
+        return "Illegal setup for pkgpart ". $part_pkg->pkgpart.
+               ": $setup_prog";
+      };

       $setup_prog = $1;
       $setup_prog = $1;

+

       my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
       $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
       $setup = $cpt->reval($setup_prog);
       unless ( defined($setup) ) {
       my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
       $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
       $setup = $cpt->reval($setup_prog);
       unless ( defined($setup) ) {

-        warn "Error reval-ing part_pkg->setup pkgpart ", 
-             $part_pkg->pkgpart, ": $@";
-      } else {
-        $cust_pkg->setfield('setup',$time);
-        $cust_pkg_mod_flag=1; 
+        $dbh->rollback if $oldAutoCommit;
+        return "Error reval-ing part_pkg->setup pkgpart ". $part_pkg->pkgpart.
+               ": $@";

       }
       }

+      $cust_pkg->setfield('setup',$time);
+      $cust_pkg_mod_flag=1; 

     }
 
     #bill recurring fee
     }
 
     #bill recurring fee


@@ -787,43 +797,57 @@ sub bill {
          ( $cust_pkg->getfield('bill') || 0 ) < $time
     ) {
       my $recur_prog = $part_pkg->getfield('recur');
          ( $cust_pkg->getfield('bill') || 0 ) < $time
     ) {
       my $recur_prog = $part_pkg->getfield('recur');

-      $recur_prog =~ /^(.*)$/ #presumably trusted
-        or die "Illegal recur for package ". $cust_pkg->pkgnum. ": $recur_prog";
+      $recur_prog =~ /^(.*)$/ or do {
+        $dbh->rollback if $oldAutoCommit;
+        return "Illegal recur for pkgpart ". $part_pkg->pkgpart.
+               ": $recur_prog";
+      };

       $recur_prog = $1;
       $recur_prog = $1;

+

       my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
       $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
       $recur = $cpt->reval($recur_prog);
       unless ( defined($recur) ) {
       my $cpt = new Safe;
       #$cpt->permit(); #what is necessary?
       $cpt->share(qw( $cust_pkg )); #can $cpt now use $cust_pkg methods?
       $recur = $cpt->reval($recur_prog);
       unless ( defined($recur) ) {

-        warn "Error reval-ing part_pkg->recur pkgpart ",
-             $part_pkg->pkgpart, ": $@";
-      } else {
-        #change this bit to use Date::Manip? CAREFUL with timezones (see
-        # mailing list archive)
-        #$sdate=$cust_pkg->bill || time;
-        #$sdate=$cust_pkg->bill || $time;
-        $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
-        my ($sec,$min,$hour,$mday,$mon,$year) =
-          (localtime($sdate) )[0,1,2,3,4,5];
-        $mon += $part_pkg->getfield('freq');
-        until ( $mon < 12 ) { $mon -= 12; $year++; }
-        $cust_pkg->setfield('bill',
-          timelocal($sec,$min,$hour,$mday,$mon,$year));
-        $cust_pkg_mod_flag = 1; 
+        $dbh->rollback if $oldAutoCommit;
+        return "Error reval-ing part_pkg->recur pkgpart ".
+               $part_pkg->pkgpart. ": $@";

       }
       }

+      #change this bit to use Date::Manip? CAREFUL with timezones (see
+      # mailing list archive)
+      #$sdate=$cust_pkg->bill || time;
+      #$sdate=$cust_pkg->bill || $time;
+      $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
+      my ($sec,$min,$hour,$mday,$mon,$year) =
+        (localtime($sdate) )[0,1,2,3,4,5];
+      $mon += $part_pkg->getfield('freq');
+      until ( $mon < 12 ) { $mon -= 12; $year++; }
+      $cust_pkg->setfield('bill',
+        timelocal($sec,$min,$hour,$mday,$mon,$year));
+      $cust_pkg_mod_flag = 1; 

     }
 
     }
 

-    warn "setup is undefined" unless defined($setup);
-    warn "recur is undefined" unless defined($recur);
-    warn "cust_pkg bill is undefined" unless defined($cust_pkg->bill);
+    warn "\$setup is undefined" unless defined($setup);
+    warn "\$recur is undefined" unless defined($recur);
+    warn "\$cust_pkg->bill is undefined" unless defined($cust_pkg->bill);

 
     if ( $cust_pkg_mod_flag ) {
       $error=$cust_pkg->replace($old_cust_pkg);
       if ( $error ) { #just in case
 
     if ( $cust_pkg_mod_flag ) {
       $error=$cust_pkg->replace($old_cust_pkg);
       if ( $error ) { #just in case

-        warn "Error modifying pkgnum ", $cust_pkg->pkgnum, ": $error";
-      } else {
-        $setup = sprintf( "%.2f", $setup );
-        $recur = sprintf( "%.2f", $recur );
+        $dbh->rollback if $oldAutoCommit;
+        return "Error modifying pkgnum ". $cust_pkg->pkgnum. ": $error";
+      }
+      $setup = sprintf( "%.2f", $setup );
+      $recur = sprintf( "%.2f", $recur );
+      if ( $setup < 0 ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "negative setup $setup for pkgnum ". $cust_pkg->pkgnum;
+      }
+      if ( $recur < 0 ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "negative recur $recur for pkgnum ". $cust_pkg->pkgnum;
+      }
+      if ( $setup > 0 || $recur > 0 ) {

         my $cust_bill_pkg = new FS::cust_bill_pkg ({
           'pkgnum' => $cust_pkg->pkgnum,
           'setup'  => $setup,
         my $cust_bill_pkg = new FS::cust_bill_pkg ({
           'pkgnum' => $cust_pkg->pkgnum,
           'setup'  => $setup,


@@ -844,11 +868,9 @@ sub bill {
   unless ( @cust_bill_pkg ) {
     $dbh->commit or die $dbh->errstr if $oldAutoCommit;
     return '';
   unless ( @cust_bill_pkg ) {
     $dbh->commit or die $dbh->errstr if $oldAutoCommit;
     return '';

-  }
+  } 

 
 

-  unless ( $self->getfield('tax') =~ /Y/i
-           || $self->getfield('payby') eq 'COMP'
-  ) {
+  unless ( $self->tax =~ /Y/i || $self->payby eq 'COMP' ) {

     my $cust_main_county = qsearchs('cust_main_county',{
         'state'   => $self->state,
         'county'  => $self->county,
     my $cust_main_county = qsearchs('cust_main_county',{
         'state'   => $self->state,
         'county'  => $self->county,


@@ -870,25 +892,25 @@ sub bill {
   }
 
   my $cust_bill = new FS::cust_bill ( {
   }
 
   my $cust_bill = new FS::cust_bill ( {

-    'custnum' => $self->getfield('custnum'),
-    '_date' => $time,
+    'custnum' => $self->custnum,
+    '_date'   => $time,

     'charged' => $charged,
   } );
   $error = $cust_bill->insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     'charged' => $charged,
   } );
   $error = $cust_bill->insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;

-    return "$error for customer #". $self->custnum;
+    return "can't create invoice for customer #". $self->custnum. ": $error";

   }
 
   my $invnum = $cust_bill->invnum;
   my $cust_bill_pkg;
   foreach $cust_bill_pkg ( @cust_bill_pkg ) {
   }
 
   my $invnum = $cust_bill->invnum;
   my $cust_bill_pkg;
   foreach $cust_bill_pkg ( @cust_bill_pkg ) {

-    $cust_bill_pkg->setfield( 'invnum', $invnum );
+    warn $cust_bill_pkg->invnum($invnum);

     $error = $cust_bill_pkg->insert;
     $error = $cust_bill_pkg->insert;

-    #shouldn't happen, but how else tohandle this?

     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;

-      return "$error for customer #". $self->custnum;
+      return "can't create invoice line item for customer #". $self->custnum.
+             ": $error";

     }
   }
   
     }
   }
   


@@ -906,6 +928,8 @@ a credit card (`CARD'), or just add any necessary (pseudo-)payment (`COMP').
 
 If there is an error, returns the error, otherwise returns false.
 
 
 If there is an error, returns the error, otherwise returns false.
 

+Options are passed as name-value pairs.
+

 Currently available options are:
 
 invoice_time - Use this time when deciding when to print invoices and
 Currently available options are:
 
 invoice_time - Use this time when deciding when to print invoices and


@@ -937,10 +961,10 @@ sub collect {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 

-  my $total_owed = $self->balance;
-  warn "collect: total owed $total_owed " if $Debug;
-  unless ( $total_owed > 0 ) { #redundant?????
-    $dbh->rollback if $oldAutoCommit;
+  my $balance = $self->balance;
+  warn "collect: balance $balance" if $Debug;
+  unless ( $balance > 0 ) { #redundant?????
+    $dbh->rollback if $oldAutoCommit; #hmm

     return '';
   }
 
     return '';
   }
 


@@ -949,18 +973,18 @@ sub collect {
   ) {
 
     #this has to be before next's
   ) {
 
     #this has to be before next's

-    my $amount = sprintf( "%.2f", $total_owed < $cust_bill->owed
-                                  ? $total_owed
+    my $amount = sprintf( "%.2f", $balance < $cust_bill->owed
+                                  ? $balance

                                   : $cust_bill->owed
     );
                                   : $cust_bill->owed
     );

-    $total_owed = sprintf( "%.2f", $total_owed - $amount );
+    $balance = sprintf( "%.2f", $balance - $amount );

 
     next unless $cust_bill->owed > 0;
 
 
     next unless $cust_bill->owed > 0;
 

-    # ??????????
+    # don't try to charge for the same invoice if it's already in a batch

     next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
 
     next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } );
 

-    warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)" if $Debug;
+    warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, balance $balance)" if $Debug;

 
     next unless $amount > 0;
 
 
     next unless $amount > 0;
 


@@ -1115,6 +1139,8 @@ sub collect {
 
         } elsif ( $processor =~ /^Business::OnlinePayment::(.*)$/ ) {
 
 
         } elsif ( $processor =~ /^Business::OnlinePayment::(.*)$/ ) {
 

+          my $bop_processor = $1;
+

           my($payname, $payfirst, $paylast);
           if ( $self->payname ) {
             $payname = $self->payname;
           my($payname, $payfirst, $paylast);
           if ( $self->payname ) {
             $payname = $self->payname;


@@ -1130,7 +1156,8 @@ sub collect {
             $payname =  "$payfirst $paylast";
           }
         
             $payname =  "$payfirst $paylast";
           }
         

-          my $transaction = new Business::OnlinePayment( $1, @bop_options );
+          my $transaction =
+            new Business::OnlinePayment( $bop_processor, @bop_options );

           $transaction->content(
             'type'           => 'CC',
             'login'          => $bop_login,
           $transaction->content(
             'type'           => 'CC',
             'login'          => $bop_login,


@@ -1177,7 +1204,7 @@ sub collect {
                    $transaction->result_code. ": ". $transaction->error_message;
           } else {
             $dbh->commit or die $dbh->errstr if $oldAutoCommit;
                    $transaction->result_code. ": ". $transaction->error_message;
           } else {
             $dbh->commit or die $dbh->errstr if $oldAutoCommit;

-            return ''
+            #return '';

           }
 
         } else {
           }
 
         } else {


@@ -1226,7 +1253,7 @@ sub collect {
 =item total_owed
 
 Returns the total owed for this customer on all invoices
 =item total_owed
 
 Returns the total owed for this customer on all invoices

-(see L<FS::cust_bill>).
+(see L<FS::cust_bill/owed>).

 
 =cut
 
 
 =cut
 


@@ -1323,7 +1350,7 @@ sub apply_payments {
     if ( $cust_bill->owed >= $payment->unapplied ) {
       $amount = $payment->unapplied;
     } else {
     if ( $cust_bill->owed >= $payment->unapplied ) {
       $amount = $payment->unapplied;
     } else {

-      $amount = $payment->owed;
+      $amount = $cust_bill->owed;

     }
 
     my $cust_bill_pay = new FS::cust_bill_pay ( {
     }
 
     my $cust_bill_pay = new FS::cust_bill_pay ( {


@@ -1343,7 +1370,8 @@ sub apply_payments {
 
 =item total_credited
 
 
 =item total_credited
 

-Returns the total credits (see L<FS::cust_credit>) for this customer.
+Returns the total outstanding credit (see L<FS::cust_credit>) for this
+customer.  See L<FS::cust_credit/credited>.

 
 =cut
 
 
 =cut
 


@@ -1358,15 +1386,36 @@ sub total_credited {
   sprintf( "%.2f", $total_credit );
 }
 
   sprintf( "%.2f", $total_credit );
 }
 

+=item total_unapplied_payments
+
+Returns the total unapplied payments (see L<FS::cust_pay>) for this customer.
+See L<FS::cust_pay/unapplied>.
+
+=cut
+
+sub total_unapplied_payments {
+  my $self = shift;
+  my $total_unapplied = 0;
+  foreach my $cust_pay ( qsearch('cust_pay', {
+    'custnum' => $self->custnum,
+  } ) ) {
+    $total_unapplied += $cust_pay->unapplied;
+  }
+  sprintf( "%.2f", $total_unapplied );
+}
+

 =item balance
 
 =item balance
 

-Returns the balance for this customer (total owed minus total credited).
+Returns the balance for this customer (total_owed minus total_credited
+minus total_unapplied_payments).

 
 =cut
 
 sub balance {
   my $self = shift;
 
 =cut
 
 sub balance {
   my $self = shift;

-  sprintf( "%.2f", $self->total_owed - $self->total_credited );
+  sprintf( "%.2f",
+    $self->total_owed - $self->total_credited - $self->total_unapplied_payments
+  );

 }
 
 =item invoicing_list [ ARRAYREF ]
 }
 
 =item invoicing_list [ ARRAYREF ]


@@ -1501,7 +1550,7 @@ sub rebuild_fuzzyfiles {
 
 =head1 VERSION
 
 
 =head1 VERSION
 

-$Id: cust_main.pm,v 1.28 2001-09-02 04:25:55 ivan Exp $
+$Id: cust_main.pm,v 1.29 2001-09-03 22:07:38 ivan Exp $

 
 =head1 BUGS
 
 
 =head1 BUGS
 

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 70d1b73..42ca0b0 100644 (file)
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -3,7 +3,7 @@ package FS::cust_pay;
 use strict;
 use vars qw( @ISA );
 use Business::CreditCard;
 use strict;
 use vars qw( @ISA );
 use Business::CreditCard;

-use FS::Record qw( dbh );
+use FS::Record qw( dbh qsearch qsearchs );

 use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_main;
 use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_main;


@@ -94,6 +94,21 @@ sub insert {
   return $error if $error;
 
   if ( $self->invnum ) {
   return $error if $error;
 
   if ( $self->invnum ) {

+    my $cust_bill = qsearchs('cust_bill', { 'invnum' => $self->invnum } )
+      or do {
+        $dbh->rollback if $oldAutoCommit;
+        return "Unknown cust_bill.invnum: ". $self->invnum;
+      };
+    $self->custnum($cust_bill->custnum );
+  }
+
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "error inserting $self: $error";
+  }
+
+  if ( $self->invnum ) {

     my $cust_bill_pay = new FS::cust_bill_pay {
       'invnum' => $self->invnum,
       'paynum' => $self->paynum,
     my $cust_bill_pay = new FS::cust_bill_pay {
       'invnum' => $self->invnum,
       'paynum' => $self->paynum,


@@ -103,18 +118,8 @@ sub insert {
     $error = $cust_bill_pay->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
     $error = $cust_bill_pay->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;

-      return $error;
+      return "error inserting $cust_bill_pay: $error";

     }
     }

-    warn $cust_bill_pay;
-    warn $cust_bill_pay->cust_bill;
-    warn $cust_bill_pay->cust_bill->custnum;
-    $self->custnum($cust_bill_pay->cust_bill->custnum);
-  }
-
-  $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;

   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;


@@ -276,7 +281,7 @@ sub unapplied {
 
 =head1 VERSION
 
 
 =head1 VERSION
 

-$Id: cust_pay.pm,v 1.6 2001-09-02 05:38:13 ivan Exp $
+$Id: cust_pay.pm,v 1.7 2001-09-03 22:07:38 ivan Exp $

 
 =head1 BUGS
 
 
 =head1 BUGS
 

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 77151b8..daec79f 100644 (file)
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -58,7 +58,7 @@ The following fields are currently supported:
 
 Creates a new service.  To add the refund to the database, see L<"insert">.
 Services are normally created by creating FS::svc_ objects (see
 
 Creates a new service.  To add the refund to the database, see L<"insert">.
 Services are normally created by creating FS::svc_ objects (see

-L<FS::svc_acct>, L<FS::svc_domain>, and L<FS::svc_acct_sm>, among others).
+L<FS::svc_acct>, L<FS::svc_domain>, and L<FS::svc_forward>, among others).

 
 =cut
 
 
 =cut
 


@@ -155,7 +155,7 @@ sub label {
 
 =head1 VERSION
 
 
 =head1 VERSION
 

-$Id: cust_svc.pm,v 1.4 2001-09-02 04:51:11 ivan Exp $
+$Id: cust_svc.pm,v 1.5 2001-09-03 22:07:38 ivan Exp $

 
 =head1 BUGS
 
 
 =head1 BUGS
 

diff --git a/FS/bin/freeside-bill b/FS/bin/freeside-bill
index 3462fa1..1dce9a1 100755 (executable)
--- a/FS/bin/freeside-bill
+++ b/FS/bin/freeside-bill
@@ -55,15 +55,19 @@ foreach $cust_main (
   warn "Error billing,  customer #" . $cust_main->getfield('custnum') . 
     ":" . $error if $error;
 
   warn "Error billing,  customer #" . $cust_main->getfield('custnum') . 
     ":" . $error if $error;
 

+  if ($main::opt_p) {
+    $cust_main->apply_payments;
+    $error=$cust_main->apply_credits;
+  }
+

   if ($main::opt_c) {
     $error=$cust_main->collect('invoice_time'=>$time,
                                'batch_card' => $main::opt_i ? 'no' : 'yes',
                               );
   if ($main::opt_c) {
     $error=$cust_main->collect('invoice_time'=>$time,
                                'batch_card' => $main::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;

   }
 
 }
   }
 
 }


@@ -89,7 +93,7 @@ freeside-bill - Command line (crontab, script) interface to customer billing.
 
 =head1 SYNOPSIS
 
 
 =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
 
 
 =head1 DESCRIPTION
 


@@ -98,6 +102,9 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -c: Turn on collecting (you probably want this).
 
 
   -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)
 
   -a: Call collect even if there isn't a new invoice (probably a bad idea for
       daily use)
 


@@ -114,7 +121,7 @@ customers.  Otherwise, bills all customers.
 
 =head1 VERSION
 
 
 =head1 VERSION
 

-$Id: freeside-bill,v 1.7 2001-08-21 09:34:13 ivan Exp $
+$Id: freeside-bill,v 1.8 2001-09-03 22:07:39 ivan Exp $

 
 =head1 BUGS
 
 
 =head1 BUGS
 

diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
index f99b7eb..262b697 100644 (file)
--- a/httemplate/docs/signup.html
+++ b/httemplate/docs/signup.html
@@ -42,7 +42,7 @@ Optional:
     <li>$password
     <li>$email_name - first and last name
   </ul>
     <li>$password
     <li>$email_name - first and last name
   </ul>

-  (an example file is included as <b>fs_signup/ieak.template</b>)
+  (an example file is included as <b>fs_signup/ieak.template</b>)  See the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.

   <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
   <ul>
     <li>$ac - area code of selected POP
   <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
   <ul>
     <li>$ac - area code of selected POP

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 6d50188..518d761 100644 (file)
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -181,8 +181,34 @@ ALTER TABLE cust_main ADD COLUMN comments varchar NULL;
   <table border><tr><th>PostgreSQL</th><th>MySQL, others</th></tr>
 <tr><td>
 <font size=-1><pre>
   <table border><tr><th>PostgreSQL</th><th>MySQL, others</th></tr>
 <tr><td>
 <font size=-1><pre>

-ALTER TABLE cust_pay RENAME COLUMN invnum TO depreciated;
-ALTER TABLE cust_refund RENAME COLUMN crednum TO depreciated;
+CREATE TABLE cust_pay_temp (
+  paynum int primary key,
+  custnum int not null,
+  paid decimal(10,2) not null,
+  _date int null,
+  payby char(4) not null,
+  payinfo varchar(16) null,
+  paybatch varchar(80) null
+);
+INSERT INTO cust_pay_temp SELECT * from cust_pay;
+DROP TABLE cust_pay;
+ALTER TABLE cust_pay_temp RENAME TO cust_pay;
+CREATE UNIQUE INDEX cust_pay1 ON cust_pay paynum;
+CREATE TABLE cust_refund_temp (
+  refundnum int primary key,
+  custnum int not null,
+  _date int null,
+  refund decimal(10,2) not null,
+  otaker varchar(8) not null,
+  reason varchar(80) not null,
+  payby char(4) not null,
+  payinfo varchar(16) null,
+  paybatch varchar(80) null
+);
+INSERT INTO cust_refund_temp SELECT * from cust_refund;
+DROP TABLE cust_refund;
+ALTER TABLE cust_refund_temp RENAME TO cust_refund;
+CREATE UNIQUE INDEX cust_refund1 ON cust_refund refundnum;

 </pre></font>
 </td><td>
 <font size=-1><pre>
 </pre></font>
 </td><td>
 <font size=-1><pre>

diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index a956366..9b21538 100755 (executable)
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
 <%

-#<!-- $Id: cust_credit.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->

 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );


@@ -42,31 +42,29 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>

-    <PRE>

 END
 
 $crednum = "";
 print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
 
 END
 
 $crednum = "";
 print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
 

-print qq!\nCustomer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+print qq!<BR>Customer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;

 
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 
 
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 

-print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;

 
 

-print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;

 print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
 
 #print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
 
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
 
 print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
 
 #print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
 
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
 

-print qq!\nReason <INPUT TYPE="text" NAME="reason" VALUE="$reason" SIZE=72>!;
+print qq!<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="$reason">!;

 
 print <<END;
 
 print <<END;

-</PRE>

 <BR>
 <BR>

-<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+<INPUT TYPE="submit" VALUE="Post">

 END
 
 print <<END;
 END
 
 print <<END;

diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index c4cd34e..13bad18 100755 (executable)
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,11 +1,12 @@
 <%
 <%

-#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-09-02 07:49:52 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->

 
 use strict;
 
 use strict;

-use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $_date $amount $reason $cust_credit );
+use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );

 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);

+use Date::Format;

 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch fields);
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch fields);


@@ -32,7 +33,6 @@ if ( $cgi->param('error') ) {
   #$refund = 'yes';
   $invnum = '';
 }
   #$refund = 'yes';
   $invnum = '';
 }

-$_date = time;

 
 $otaker = getotaker;
 
 
 $otaker = getotaker;
 


@@ -44,31 +44,65 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>

-    <PRE>

 END
 
 die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
 
 END
 
 die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
 

-print qq!Credit #<B>!, $crednum, qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
+my $credited = $cust_credit->credited;
+
+print "Credit # <B>$crednum</B>".
+      qq!<INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!.
+      '<BR>Date: <B>'. time2str("%D", $cust_credit->_date). '</B>'.
+      '<BR>Amount: $<B>'. $cust_credit->amount. '</B>'.
+      "<BR>Unapplied amount: \$<B>$credited</B>".
+      '<BR>Reason: <B>'. $cust_credit->reason. '</B>'
+      ;
+
+my @cust_bill = grep $_->owed != 0,
+                qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } );
+
+print <<END;
+<SCRIPT>
+function changed(what) {
+  cust_bill = what.options[what.selectedIndex].value;
+END

 
 

-print qq!\nInvoice # <SELECT NAME="invnum" SIZE=1>!;
-foreach $_ (grep $_->owed != 0, qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ) ) {
-  print "<OPTION", (($_->invnum eq $invnum) ? " SELECTED" : ""),
-    qq! VALUE="! .$_->invnum. qq!">!. $_->invnum. qq! (! . $_->owed . qq!)!;
+foreach my $cust_bill ( @cust_bill ) {
+  my $invnum = $cust_bill->invnum;
+  my $changeto = $cust_bill->owed < $cust_credit->credited
+                   ? $cust_bill->owed 
+                   : $cust_credit->credited;
+  print <<END;
+  if ( cust_bill == $invnum ) {
+    what.form.amount.value = "$changeto";
+  }
+END

 }
 }

-print qq!<OPTION VALUE="Refund">Refund!;
-print "</SELECT>";

 
 

-print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+print <<END;
+  if ( cust_bill == "Refund" ) {
+    what.form.amount.value = "$credited";
+  }
+}
+</SCRIPT>
+END

 
 

-print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
+      '<OPTION VALUE="">';
+foreach my $cust_bill ( @cust_bill ) {
+  print '<OPTION'. ( $cust_bill->invnum eq $invnum ? ' SELECTED' : '' ).
+        ' VALUE="'. $cust_bill->invnum. '">'. $cust_bill->invnum.
+        ' -  '. time2str("%D",$cust_bill->_date).
+        ' - $'. $cust_bill->owed;
+}
+print qq!<OPTION VALUE="Refund">Refund!;
+print "</SELECT>";

 
 

-#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;

 
 print <<END;
 
 print <<END;

-</PRE>

 <BR>
 <BR>

-<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+<INPUT TYPE="submit" VALUE="Apply">

 END
 
 print <<END;
 END
 
 print <<END;

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index d1823d4..c83f585 100755 (executable)
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,8 +1,8 @@
 <%
 <%

-#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->

 
 use strict;
 
 use strict;

-use vars qw( $cgi $invnum $p1 $_date $payby $payinfo $paid );
+use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );

 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);


@@ -13,17 +13,27 @@ $cgi = new CGI;
 cgisuidsetup($cgi);
 
 if ( $cgi->param('error') ) {
 cgisuidsetup($cgi);
 
 if ( $cgi->param('error') ) {

-  $invnum = $cgi->param('invnum');
+  $link = $cgi->param('link');
+  $linknum = $cgi->param('linknum');

   $paid = $cgi->param('paid');
   $payby = $cgi->param('payby');
   $payinfo = $cgi->param('payinfo');
   $paid = $cgi->param('paid');
   $payby = $cgi->param('payby');
   $payinfo = $cgi->param('payinfo');

-} else {
-  my ($query) = $cgi->keywords;
+} elsif ($cgi->keywords) {
+  my($query) = $cgi->keywords;

   $query =~ /^(\d+)$/;
   $query =~ /^(\d+)$/;

-  $invnum = $1;
+  $link = 'invnum';
+  $linknum = $1;

   $paid = '';
   $paid = '';

-  $payby = "BILL";
+  $payby = 'BILL';

   $payinfo = "";
   $payinfo = "";

+} elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
+  $link = 'custnum';
+  $linknum = $1;
+  $paid = '';
+  $payby = 'BILL';
+  $payinfo = '';
+} else {
+  die "illegal query ". $cgi->keywords;

 }
 $_date = time;
 
 }
 $_date = time;
 


@@ -36,10 +46,15 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 
 print <<END;
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
 
 print <<END;
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>

-    <HR><PRE>
+    <INPUT TYPE="hidden" NAME="link" VALUE="$link">
+    <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">

 END
 
 END
 

-print qq!Invoice #<B>$invnum</B><INPUT TYPE="hidden" NAME="invnum" VALUE="$invnum">!;
+if ( $link eq 'invnum' ) {
+  print "Invoice #<B>$linknum</B>";
+} elsif ( $link eq 'custnum' ) {
+  print "Customer #<B>$linknum</B>";
+}

 
 print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
 
 
 print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
 

diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index fcdc233..9be9650 100755 (executable)
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,8 +1,8 @@
 <%
 <%

-#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->

 
 use strict;
 
 use strict;

-use vars qw( $cgi $invnum $new $error );
+use vars qw( $cgi $link $linknum $new $error );

 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);


@@ -13,24 +13,32 @@ use FS::cust_pay;
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 

-$cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$invnum = $1;
+$cgi->param('linknum') =~ /^(\d+)$/
+  or die "Illegal linknum: ". $cgi->param('linknum');
+$linknum = $1;
+
+$cgi->param('link') =~ /^(custnum|invnum)$/
+  or die "Illegal link: ". $cgi->param('link');
+$link = $1;

 
 $new = new FS::cust_pay ( {
 
 $new = new FS::cust_pay ( {

+  $link => $linknum,

   map {
     $_, scalar($cgi->param($_));
   map {
     $_, scalar($cgi->param($_));

-  #} qw(invnum paid _date payby payinfo paybatch)
-  } fields('cust_pay')
+  } qw(paid _date payby payinfo paybatch)
+  #} fields('cust_pay')

 } );
 
 } );
 

-$error=$new->insert;
+$error = $new->insert;

 
 if ($error) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
   exit;
 
 if ($error) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
   exit;

-} else {
-  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$invnum");
+} elsif ( $link eq 'invnum' ) {
+  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
+} elsif ( $link eq 'custnum' ) {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");

 }
 
 %>
 }
 
 %>

diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index cc79383..43c7c57 100755 (executable)
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -1,5 +1,5 @@
 <%
 <%

-#<!-- $Id: bill.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->

 
 use strict;
 use vars qw( $cgi $query $custnum $cust_main $error );
 
 use strict;
 use vars qw( $cgi $query $custnum $cust_main $error );


@@ -25,6 +25,9 @@ $error = $cust_main->bill(
                          );
 &eidiot($error) if $error;
 
                          );
 &eidiot($error) if $error;
 

+$cust_main->apply_payments;
+$cust_main->apply_credits;
+

 $error = $cust_main->collect(
 #                             'invoice-time'=>$time,
 #                             'batch_card'=> 'yes',
 $error = $cust_main->collect(
 #                             'invoice-time'=>$time,
 #                             'batch_card'=> 'yes',

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 12fe857..1e024f3 100755 (executable)
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,5 +1,5 @@
 <%
 <%

-# <!-- $Id: cust_bill.cgi,v 1.2 2001-08-21 02:31:57 ivan Exp $ -->
+# <!-- $Id: cust_bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->

 
 use strict;
 use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
 
 use strict;
 use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );


@@ -29,9 +29,13 @@ $p = popurl(2);
 print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
 print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",

-)), <<END;
-      <A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A>
-      <BR><A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>
+));
+
+print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A> | !
+  if $cust_bill->owed > 0;
+
+print <<END;
+      <A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>

       <BR><BR>(Printed $printed times)
     <PRE>
 END
       <BR><BR>(Printed $printed times)
     <PRE>
 END

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 6ece5c2..a32abc0 100755 (executable)
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
 <%

-#<!-- $Id: cust_main.cgi,v 1.7 2001-09-02 07:49:52 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.8 2001-09-03 22:07:39 ivan Exp $ -->

 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 


@@ -192,7 +192,7 @@ print '<BR>';
 
   @invoicing_list = $cust_main->invoicing_list;
   print "Billing information (",
 
   @invoicing_list = $cust_main->invoicing_list;
   print "Billing information (",

-       qq!<A HREF="!, popurl(2), qq!/misc/bill.cgi?$custnum">!, "Bill now</A>)",
+       qq!<A HREF="!, popurl(2), qq!misc/bill.cgi?$custnum">!, "Bill now</A>)",

         &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
         '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
         $cust_main->tax ? 'yes' : 'no',
         &ntable("#cccccc"), "<TR><TD>", &ntable("#cccccc",2),
         '<TR><TD ALIGN="right">Tax exempt</TD><TD BGCOLOR="#ffffff">',
         $cust_main->tax ? 'yes' : 'no',


@@ -269,9 +269,9 @@ print qq!!, &table(), "\n",
 
 #get package info
 if ( $conf->exists('hidecancelledpackages') ) {
 
 #get package info
 if ( $conf->exists('hidecancelledpackages') ) {

-  @packages = $cust_main->ncancelled_pkgs;
+  @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->ncancelled_pkgs);

 } else {
 } else {

-  @packages = $cust_main->all_pkgs;
+  @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->all_pkgs);

 }
 
 $n1 = '<TR>';
 }
 
 $n1 = '<TR>';


@@ -320,28 +320,31 @@ print "</TR>";
 print "</TABLE>";
 
 #formatting
 print "</TABLE>";
 
 #formatting

-print qq!<BR><BR><A NAME="history">Payment History!,
-      qq!</A>!,
-      qq! ( Click on invoice to view invoice/enter payment. | !,
-      qq!<A HREF="!, popurl(2), qq!edit/cust_credit.cgi?$custnum">!,
-      qq!Post credit / refund</A> )!;
+print qq!<BR><BR><A NAME="history">Payment History!.
+      qq!</A> ( !.
+      qq!<A HREF="!. popurl(2). qq!edit/cust_pay.cgi?custnum=$custnum">!.
+      qq!Post payment</A> | !.
+      qq!<A HREF="!. popurl(2). qq!edit/cust_credit.cgi?$custnum">!.
+      qq!Post credit</A> )!;

 
 #get payment history
 #
 # major problem: this whole thing is way too sloppy.
 # minor problem: the description lines need better formatting.
 
 
 #get payment history
 #
 # major problem: this whole thing is way too sloppy.
 # minor problem: the description lines need better formatting.
 

-# SHOULD SHOW UNAPPLIED PAYMENTS (now show unapplied credits)
-

 @history = (); #needed for mod_perl :)
 
 @bills = qsearch('cust_bill',{'custnum'=>$custnum});
 foreach $bill (@bills) {
   my($bref)=$bill->hashref;
 @history = (); #needed for mod_perl :)
 
 @bills = qsearch('cust_bill',{'custnum'=>$custnum});
 foreach $bill (@bills) {
   my($bref)=$bill->hashref;

+  my $bpre = ( $bill->owed > 0 )
+               ? '<b><font size="+1" color="#ff0000"> Open '
+               : '';
+  my $bpost = ( $bill->owed > 0 ) ? '</font></b>' : '';

   push @history,
     $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .
   push @history,
     $bref->{_date} . qq!\t<A HREF="!. popurl(2). qq!view/cust_bill.cgi?! .

-    $bref->{invnum} . qq!">Invoice #! . $bref->{invnum} .
-    qq! (Balance \$! . $bill->owed . qq!)</A>\t! .
+    $bref->{invnum} . qq!">${bpre}Invoice #! . $bref->{invnum} .
+    qq! (Balance \$! . $bill->owed . qq!)$bpost</A>\t! .

     $bref->{charged} . qq!\t\t\t!;
 
   my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
     $bref->{charged} . qq!\t\t\t!;
 
   my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );


@@ -356,6 +359,7 @@ foreach $bill (@bills) {
                                              $payment->payinfo,
                                              $cust_bill_pay->amount,
                       );
                                              $payment->payinfo,
                                              $cust_bill_pay->amount,
                       );

+    $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4) if $payby eq 'CARD';

     push @history,
       "$date\tPayment, Invoice #$invnum ($payby $payinfo)\t\t$paid\t\t";
   }
     push @history,
       "$date\tPayment, Invoice #$invnum ($payby $payinfo)\t\t$paid\t\t";
   }


@@ -364,33 +368,34 @@ foreach $bill (@bills) {
     qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
   foreach my $cust_credit_bill (@cust_credit_bill) {
     my $cust_credit = $cust_credit_bill->cust_credit;
     qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
   foreach my $cust_credit_bill (@cust_credit_bill) {
     my $cust_credit = $cust_credit_bill->cust_credit;

-    my($date, $invnum, $crednum, $amount, $reason ) = (
+    my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (

       $cust_credit->_date,
       $cust_credit_bill->invnum,
       $cust_credit_bill->crednum,
       $cust_credit_bill->amount,
       $cust_credit->reason,
       $cust_credit->_date,
       $cust_credit_bill->invnum,
       $cust_credit_bill->crednum,
       $cust_credit_bill->amount,
       $cust_credit->reason,

+      time2str("%D", $cust_credit_bill->_date),

     );
     push @history,
     );
     push @history,

-      "$date\tCredit #$crednum, Invoice #$invnum $reason\t\t\t$amount\t";
+      "$date\tCredit #$crednum: $reason<BR>".
+      "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";

   }
 }
 
   }
 }
 

-@credits = grep $_->credited, qsearch('cust_credit',{'custnum'=>$custnum});
+@credits = grep { $_->credited > 0 }
+           qsearch('cust_credit',{'custnum'=>$custnum});

 foreach $credit (@credits) {
   my($cref)=$credit->hashref;
   push @history,
     $cref->{_date} . "\t" .
     qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
 foreach $credit (@credits) {
   my($cref)=$credit->hashref;
   push @history,
     $cref->{_date} . "\t" .
     qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.

-    '<font color="#ff0000">Unapplied credit #' .
-    $cref->{crednum} . ", (Balance \$" .
-    $credit->credited . ")</font></A> ".
-    $cref->{reason} . "\t\t\t" . $cref->{amount} . "\t";
+    '<b><font size="+1" color="#ff0000">Unapplied credit #' .
+    $cref->{crednum} . "</font></b></A>: ".
+    $cref->{reason} . "\t\t\t" . $credit->credited . "\t";

 }
 
 my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
 }
 
 my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );

-my($refund);
-foreach $refund (@refunds) {
+foreach my $refund (@refunds) {

   my($rref)=$refund->hashref;
   my($refundnum) = (
     $refund->refundnum,
   my($rref)=$refund->hashref;
   my($refundnum) = (
     $refund->refundnum,


@@ -403,6 +408,16 @@ foreach $refund (@refunds) {
     $rref->{refund};
 }
 
     $rref->{refund};
 }
 

+my @unapplied_payments =
+  grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
+foreach my $payment (@unapplied_payments) {
+  push @history,
+    $payment->_date. "\t".
+    '<A HREF="'. popurl(2). 'edit/cust_bill_pay.cgi?'. $payment->paynum. '">'.
+    '<b><font size="+1" color="#ff0000">Unapplied payment #' .
+    $payment->paynum . "</font></b></A>".
+    "\t\t" . $payment->unapplied . "\t\t";
+}

 
         #formatting
         print &table(), <<END;
 
         #formatting
         print &table(), <<END;