This commit was manufactured by cvs2svn to create tag 'freeside_1_4_2'.

[freeside.git] / FS / FS / cust_pay.pm

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 55f2fc4..0eae59f 100644 (file)
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -1,12 +1,13 @@
 package FS::cust_pay;
 
 use strict;
-use vars qw( @ISA $conf $unsuspendauto );
+use vars qw( @ISA $conf $unsuspendauto $smtpmachine $invoice_from );
 use Date::Format;
+use Mail::Header;
+use Mail::Internet 1.44;
 use Business::CreditCard;
 use FS::UID qw( dbh );
 use FS::Record qw( dbh qsearch qsearchs dbh );
-use FS::Misc qw(send_email);
 use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_main;
@@ -14,10 +15,14 @@ use FS::cust_main;
 @ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
-FS::UID->install_callback( sub { 
+$FS::UID::callback{'FS::cust_pay'} = sub { 
+
   $conf = new FS::Conf;
   $unsuspendauto = $conf->exists('unsuspendauto');
-} );
+  $smtpmachine = $conf->config('smtpmachine');
+  $invoice_from = $conf->config('invoice_from');
+
+};
 
 =head1 NAME
 
@@ -260,12 +265,19 @@ sub delete {
   if ( $conf->config('deletepayments') ne '' ) {
 
     my $cust_main = qsearchs('cust_main',{ 'custnum' => $self->custnum });
-
-    my $error = send_email(
-      'from'    => $conf->config('invoice_from'), #??? well as good as any
-      'to'      => $conf->config('deletepayments'),
-      'subject' => 'FREESIDE NOTIFICATION: Payment deleted',
-      'body'    => [
+    #false laziness w/FS::cust_bill::send & fs_signup_server
+    $ENV{MAILADDRESS} = $invoice_from; #??? well as good as any
+    my $header = new Mail::Header ( [
+      "From: $invoice_from",
+      "To: ". $conf->config('deletepayments'),
+      "Sender: $invoice_from",
+      "Reply-To: $invoice_from",
+      "Date: ". time2str("%a, %d %b %Y %X %z", time),
+      "Subject: FREESIDE NOTIFICATION: Payment deleted",
+    ] );
+    my $message = new Mail::Internet (
+      'Header' => $header,
+      'Body' => [ 
         "This is an automatic message from your Freeside installation\n",
         "informing you that the following payment has been deleted:\n",
         "\n",
@@ -279,12 +291,16 @@ sub delete {
         'paybatch: '. $self->paybatch. "\n",
       ],
     );
-
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "can't send payment deletion notification: $error";
-    }
-
+    $!=0;
+    $message->smtpsend( Host => $smtpmachine )
+      or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
+        or do {
+          $dbh->rollback if $oldAutoCommit;
+          return "(customer # ". $self->custnum.
+                 ") can't send payment deletion email to ".
+                 $conf->config('deletepayments').
+                 " via server $smtpmachine with SMTP: $!";
+        };
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -386,11 +402,19 @@ sub unapplied {
   sprintf("%.2f", $amount );
 }
 
-=back
+=item cust_main
+
+Returns the parent customer object (see L<FS::cust_main>).
+
+=cut
 
-=head1 VERSION
+sub cust_main {
+  my $self = shift;
+  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+}
 
-$Id: cust_pay.pm,v 1.24 2003-05-19 12:00:44 ivan Exp $
+
+=back
 
 =head1 BUGS