finish cleaning up the quiet stuff

2 files changed, 14 insertions, 4 deletions

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 8a37ada23..c35985f23 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -8,7 +8,7 @@ use vars qw( $xaction $E_NoErr );
 use vars qw( $bop_processor $bop_login $bop_password $bop_action @bop_options );
 use vars qw( $ach_processor $ach_login $ach_password $ach_action @ach_options );
 use vars qw( $invoice_lines @buf ); #yuck
-use vars qw( $quiet );
+use vars qw( $realtime_bop_decline_quiet );
 use Date::Format;
 use Mail::Internet 1.44;
 use Mail::Header;
@@ -26,6 +26,8 @@ use FS::cust_bill_event;
 
 @ISA = qw( FS::Record );
 
+$realtime_bop_decline_quiet = 0;
+
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_bill'} = sub { 
 
@@ -856,7 +858,7 @@ sub realtime_bop {
     my $perror = "$processor error, invnum #". $self->invnum. ': '.
                  $transaction->result_code. ": ". $transaction->error_message;
 
-    if ( !$quiet && $conf->exists('emaildecline')
+    if ( !$realtime_bop_decline_quiet && $conf->exists('emaildecline')
          && grep { $_ ne 'POST' } $cust_main->invoicing_list
     ) {
       my @templ = $conf->config('declinetemplate');
@@ -1226,7 +1228,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.41.2.21 2003-06-30 18:56:02 ivan Exp $
+$Id: cust_bill.pm,v 1.41.2.22 2003-09-19 04:25:33 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 4c2a1defc..b8c7ddff1 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1324,7 +1324,15 @@ sub collect {
       warn "calling invoice event (". $part_bill_event->eventcode. ")\n"
         if $Debug;
       my $cust_main = $self; #for callback
-      my $error = eval $part_bill_event->eventcode;
+
+      my $error;
+      {
+        $FS::cust_bill::realtime_bop_decline_quiet; #supress "used only once"
+                                                    # warning
+        local $FS::cust_bill::realtime_bop_decline_quiet = 1
+          if $options{'quiet'};
+        $error = eval $part_bill_event->eventcode;
+      }
 
       my $status = '';
       my $statustext = '';