- add init file installation to Makefile, add unified init file

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

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index cb2aa46..a419ca8 100644 (file)
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -483,7 +483,10 @@ sub realtime_card {
   if ( $conf->exists('business-onlinepayment-description') ) {
     my $dtempl = $conf->config('business-onlinepayment-description');
 
-    my $agent = $self->cust_main->agent->agent;
+    my $agent_obj = $cust_main->agent
+      or die "can't retreive agent for $cust_main (agentnum ".
+             $cust_main->agentnum. ")";
+    my $agent = $agent_obj->agent;
     my $pkgs = join(', ',
       map { $_->cust_pkg->part_pkg->pkg }
         grep { $_->pkgnum } $self->cust_bill_pkg
@@ -582,9 +585,9 @@ sub realtime_card {
       my $template = new Text::Template (
         TYPE   => 'ARRAY',
         SOURCE => [ map "$_\n", @templ ],
-      ) or die "($perror) can't create template: $Text::Template::ERROR";
+      ) or return "($perror) can't create template: $Text::Template::ERROR";
       $template->compile()
-        or die "($perror) can't compile template: $Text::Template::ERROR";
+        or return "($perror) can't compile template: $Text::Template::ERROR";
 
       my $error = $transaction->error_message;
 
@@ -605,7 +608,7 @@ sub realtime_card {
       $!=0;
       $message->smtpsend( Host => $smtpmachine )
         or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-          or die "($perror) (customer # ". $self->custnum.
+          or return "($perror) (customer # ". $self->custnum.
             ") can't send card decline email to ".
             join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list ).
             " via server $smtpmachine with SMTP: $!";
@@ -944,7 +947,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.28 2002-04-16 09:38:19 ivan Exp $
+$Id: cust_bill.pm,v 1.32 2002-04-16 22:56:58 ivan Exp $
 
 =head1 BUGS