projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2563e2d
)
add emaildecline-exclude config option
author
ivan
<ivan>
Thu, 2 Oct 2003 14:20:29 +0000
(14:20 +0000)
committer
ivan
<ivan>
Thu, 2 Oct 2003 14:20:29 +0000
(14:20 +0000)
FS/FS/Conf.pm
patch
|
blob
|
history
FS/FS/cust_main.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
400de69
..
51feb38
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-958,6
+958,13
@@
httemplate/docs/config.html
},
{
},
{
+ 'key' => 'emaildecline-exclude',
+ 'section' => 'billing',
+ 'description' => 'List of error messages that should not trigger email decline notices, one per line.',
+ 'type' => 'textarea',
+ },
+
+ {
'key' => 'cancelmessage',
'section' => 'billing',
'description' => 'Template file for cancellation emails.',
'key' => 'cancelmessage',
'section' => 'billing',
'description' => 'Template file for cancellation emails.',
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
de22ab5
..
2ee8a42
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-1774,6
+1774,8
@@
sub realtime_bop {
if ( !$options{'quiet'} && !$realtime_bop_decline_quiet
&& $conf->exists('emaildecline')
&& grep { $_ ne 'POST' } $self->invoicing_list
if ( !$options{'quiet'} && !$realtime_bop_decline_quiet
&& $conf->exists('emaildecline')
&& grep { $_ ne 'POST' } $self->invoicing_list
+ && ! grep { $_ eq $transaction->error_message }
+ $conf->config('emaildecline-exclude')
) {
my @templ = $conf->config('declinetemplate');
my $template = new Text::Template (
) {
my @templ = $conf->config('declinetemplate');
my $template = new Text::Template (