X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill_pay.pm;h=c8b5525eabb1fa5d83e6299a6d3892523d6878db;hb=04c0875f27d36309b6d8da8063a9254fef3a7398;hp=e7040d96bf123d4abc7f5b6b90ae7ca9edb48023;hpb=80e8925f41f10f9787fa4fe245dcd056ada7a71f;p=freeside.git

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index e7040d96b..c8b5525ea 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -1,12 +1,18 @@
-package cust_bill_pay;
+package FS::cust_bill_pay;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $conf );
 use FS::Record qw( qsearch qsearchs dbh );
-#use FS::cust_bill
+use FS::cust_bill;
+use FS::cust_pay;
 
 @ISA = qw( FS::Record );
 
+#ask FS::UID to run this stuff for us later
+FS::UID->install_callback( sub { 
+  $conf = new FS::Conf;
+} );
+
 =head1 NAME
 
 FS::cust_bill_pay - Object methods for cust_bill_pay records
@@ -94,42 +100,52 @@ 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;
   }
 
-  my $cust_bill = qsearchs('cust_bill', { 'invnum' => $self->invnum } ) or do {
+  my $cust_bill = $self->cust_bill;
+  unless ( $cust_bill ) {
     $dbh->rollback if $oldAutoCommit;
     return "unknown cust_bill.invnum: ". $self->invnum;
   };
 
   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 } 
+  $bill_total += $_ foreach map { $_->amount } 
     qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
-  if ( $bill_total > $cust_bill->charged ) {
+  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;
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
+  if ( $conf->exists('invoice_send_receipts') ) {
+    my $send_error = $cust_bill->send;
+    warn "Error sending receipt: $send_error\n" if $send_error;
+  }
+
   '';
 }
 
 =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 +171,49 @@ 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;
 
+  return "amount must be > 0" if $self->amount <= 0;
+
   $self->_date(time) unless $self->_date;
 
+  $self->SUPER::check;
+}
+
+=item cust_pay 
 
-  ''; #no error
+Returns the payment (see L<FS::cust_pay>)
+
+=cut
+
+sub cust_pay {
+  my $self = shift;
+  qsearchs( 'cust_pay', { 'paynum' => $self->paynum } );
 }
 
-=back
+=item cust_bill 
 
-=head1 VERSION
+Returns the invoice (see L<FS::cust_bill>)
+
+=cut
 
-$Id: cust_bill_pay.pm,v 1.2 2001-09-01 21:55:06 jeff Exp $
+sub cust_bill {
+  my $self = shift;
+  qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
+}
+
+=back
 
 =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