X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_bill_pay.pm;h=913704befc970e24f5d1ec1a69174c471727b220;hp=045a9490b6f021cd67a927c14eeec8762a45f28a;hb=3ef62a0570055da710328937e7f65dbb2c027c62;hpb=cdd5aa1d86cd5b266e02bed58570c97c2d7698ba

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 045a9490b..913704bef 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -1,9 +1,10 @@
-package cust_bill_pay;
+package FS::cust_bill_pay;
 
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs dbh );
-#use FS::cust_bill
+use FS::cust_bill;
+use FS::cust_pay;
 
 @ISA = qw( FS::Record );
 
@@ -94,7 +95,7 @@ sub insert {
   $pay_total += $_ foreach map { $_->amount }
     qsearch('cust_bill_pay', { 'paynum' => $self->paynum } );
 
-  if ( $pay_total > $cust_pay->paid ) {
+  if ( sprintf("%.2f", $pay_total) > sprintf("%.2f", $cust_pay->paid) ) {
     $dbh->rollback if $oldAutoCommit;
     return "total cust_bill_pay.amount $pay_total for paynum ". $self->paynum.
            " greater than cust_pay.paid ". $cust_pay->paid;
@@ -106,14 +107,14 @@ sub insert {
   };
 
   my $bill_total = 0;
-  $bill_total += foreach map { $_->amount }
+  $bill_total += $_ foreach map { $_->amount }
     qsearch('cust_bill_pay', { 'invnum' => $self->invnum } );
-#  $bill_total += foreach map { $_->amount } 
-#    qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
-  if ( $bill_total > $cust_bill->charged ) {
+  $bill_total += $_ foreach map { $_->amount } 
+    qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
+  if ( sprintf("%.2f", $bill_total) > sprintf("%.2f", $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;
   }
 
@@ -124,12 +125,16 @@ sub insert {
 
 =item delete
 
-Currently unimplemented (accounting reasons).
+Deletes this payment application, unless the closed flag for the parent payment
+(see L<FS::cust_pay>) is set.
 
 =cut
 
 sub delete {
-  return "Can't (yet?) delete cust_bill_pay records!";
+  my $self = shift;
+  return "Can't delete application for closed payment"
+    if $self->cust_pay->closed =~ /^Y/i;
+  $self->SUPER::delete(@_);
 }
 
 =item replace OLD_RECORD
@@ -155,29 +160,53 @@ sub check {
   my $error = 
     $self->ut_numbern('billpaynum')
     || $self->ut_number('invnum')
-    || $self->ut_numner('paynum')
+    || $self->ut_number('paynum')
     || $self->ut_money('amount')
     || $self->ut_numbern('_date')
   ;
   return $error if $error;
 
-  $self->_date(time) unless $self->_date;
+  return "amount must be > 0" if $self->amount <= 0;
 
+  $self->_date(time) unless $self->_date;
 
   ''; #no error
 }
 
+=item cust_pay 
+
+Returns the payment (see L<FS::cust_pay>)
+
+=cut
+
+sub cust_pay {
+  my $self = shift;
+  qsearchs( 'cust_pay', { 'paynum' => $self->paynum } );
+}
+
+=item cust_bill 
+
+Returns the invoice (see L<FS::cust_bill>)
+
+=cut
+
+sub cust_bill {
+  my $self = shift;
+  qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
+}
+
 =back
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.1 2001-09-01 20:11:07 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.12 2002-02-07 22:29:34 ivan Exp $
 
 =head1 BUGS
 
 Delete and replace methods.
 
-cust_credit_bill isn't checked yet (uncomment around line 111)
+the checks for over-applied payments could be better done like the ones in
+cust_bill_credit
 
 =head1 SEE ALSO