From 840121c8e483108d435744ae684502c558972644 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 19 Sep 2003 04:25:31 +0000 Subject: [PATCH] finish cleaning up the quiet stuff --- FS/FS/cust_main.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index a92f1a3ed..997eceacc 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -2,6 +2,7 @@ package FS::cust_main; use strict; use vars qw( @ISA $conf $Debug $import ); +use vars qw( $realtime_bop_decline_quiet ); #ugh use Safe; use Carp; BEGIN { @@ -38,6 +39,8 @@ use FS::Msgcat qw(gettext); @ISA = qw( FS::Record ); +$realtime_bop_decline_quiet = 0; + $Debug = 1; #$Debug = 1; @@ -1377,7 +1380,12 @@ 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; + { + local $realtime_bop_decline_quiet = 1 if $options{'quiet'}; + $error = eval $part_bill_event->eventcode; + } my $status = ''; my $statustext = ''; @@ -1682,7 +1690,8 @@ sub realtime_bop { my $perror = "$processor error: ". $transaction->error_message; - if ( !$options{'quiet'} && $conf->exists('emaildecline') + if ( !$options{'quiet'} && !$realtime_bop_decline_quiet + && $conf->exists('emaildecline') && grep { $_ ne 'POST' } $self->invoicing_list ) { my @templ = $conf->config('declinetemplate'); -- 2.11.0