X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pay_refund.pm;h=cb9dbcef2b7bafbe458d2bc8e3400378f7e8e12d;hb=f9a181e4c2e505df84de16190ee3b75011326f3f;hp=55a5eb7782b45ddc51e52fc70c8b49ebbb6edacf;hpb=157e8bdba110b7aac022bd2c2f7b377d3c5b2f85;p=freeside.git

diff --git a/FS/FS/cust_pay_refund.pm b/FS/FS/cust_pay_refund.pm
index 55a5eb778..cb9dbcef2 100644
--- a/FS/FS/cust_pay_refund.pm
+++ b/FS/FS/cust_pay_refund.pm
@@ -77,10 +77,11 @@ error, otherwise returns false.
 
 sub insert {
   my $self = shift;
-  my $error = $self->SUPER::insert(@_);
-  return $error if $error;
-
-  '';
+  return "Can't apply refund to closed payment"
+    if $self->cust_pay->closed =~ /^Y/i;
+  return "Can't apply payment to closed refund"
+    if $self->cust_refund->closed =~ /^Y/i;
+  $self->SUPER::insert(@_);
 }
 
 =item delete
@@ -89,9 +90,9 @@ sub insert {
 
 sub delete {
   my $self = shift;
-  return "Can't apply refund to closed payment"
+  return "Can't remove refund from closed payment"
     if $self->cust_pay->closed =~ /^Y/i;
-  return "Can't apply closed refund"
+  return "Can't remove payment from closed refund"
     if $self->cust_refund->closed =~ /^Y/i;
   $self->SUPER::delete(@_);
 }
@@ -148,26 +149,26 @@ sub check {
   $self->SUPER::check;
 }
 
-=item sub cust_credit
+=item sub cust_pay
 
-Returns the credit (see L<FS::cust_credit>)
+Returns the payment (see L<FS::cust_pay>)
 
 =cut
 
-sub cust_credit {
+sub cust_pay {
   my $self = shift;
-  qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
+  qsearchs( 'cust_pay', { 'paynum' => $self->paynum } );
 }
 
-=item cust_bill 
+=item cust_refund
 
-Returns the invoice (see L<FS::cust_bill>)
+Returns the refund (see L<FS::cust_refund>)
 
 =cut
 
-sub cust_bill {
+sub cust_refund {
   my $self = shift;
-  qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
+  qsearchs( 'cust_refund', { 'refundnum' => $self->refundnum } );
 }
 
 =back