X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill_pay.pm;h=c8b5525eabb1fa5d83e6299a6d3892523d6878db;hb=af723d02722d00c863ec4552627fe4ad77973d75;hp=5ef82d6586589c2eb0d9140cfa18e1d558603e4b;hpb=fbcb45dfe5a1bce7981fe4527176b9fdf2ec54b7;p=freeside.git

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 5ef82d658..c8b5525ea 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -1,13 +1,18 @@
 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_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
@@ -95,13 +100,14 @@ 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;
   };
@@ -111,7 +117,7 @@ sub insert {
     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 ) {
+  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.
@@ -120,17 +126,26 @@ sub insert {
 
   $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
@@ -162,11 +177,11 @@ sub check {
   ;
   return $error if $error;
 
-  return "amount must be > 0" if $self->amount == 0;
+  return "amount must be > 0" if $self->amount <= 0;
 
   $self->_date(time) unless $self->_date;
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =item cust_pay 
@@ -193,10 +208,6 @@ sub cust_bill {
 
 =back
 
-=head1 VERSION
-
-$Id: cust_bill_pay.pm,v 1.8 2001-09-03 22:07:38 ivan Exp $
-
 =head1 BUGS
 
 Delete and replace methods.