diff options
author | Jonathan Prykop <jonathan@freeside.biz> | 2015-09-22 01:08:04 -0500 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2015-11-09 16:47:31 -0800 |
commit | 7133b592b4bd28a9aa887f716cd7dc67a8bbdc7a (patch) | |
tree | e51b0120b40a27d7851204ac1f0aa50abf93af92 /FS/FS/pay_batch.pm | |
parent | 9be553c793b473f85bd4061faa6635adb21f2a08 (diff) |
RT#37908: Convert existing email-sending code to use common interface [removals and switches to FS::Log]
Diffstat (limited to 'FS/FS/pay_batch.pm')
-rw-r--r-- | FS/FS/pay_batch.pm | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm index 2a522b4..d7dd7bb 100644 --- a/FS/FS/pay_batch.pm +++ b/FS/FS/pay_batch.pm @@ -10,10 +10,10 @@ use Time::Local; use Text::CSV_XS; use Date::Parse qw(str2time); use Business::CreditCard qw(cardtype); -use FS::Misc qw(send_email); # for error notification use FS::Record qw( dbh qsearch qsearchs ); use FS::Conf; use FS::cust_pay; +use FS::Log; =head1 NAME @@ -567,8 +567,8 @@ sub import_from_gateway { ); my @item_errors; - my $mail_on_error = $conf->config('batch-errors_to'); - if ( $mail_on_error ) { + my $errors_not_fatal = $conf->config('batch-errors_not_fatal'); + if ( $errors_not_fatal ) { # construct error trap $proc_opt{'on_parse_error'} = sub { my ($self, $line, $error) = @_; @@ -801,15 +801,10 @@ sub import_from_gateway { "Errors during batch import: ".scalar(@item_errors), @item_errors ); - if ( $mail_on_error ) { - my $subject = "Batch import errors"; #? - my $body = "Import from gateway ".$gateway->label."\n".$error_text; - send_email( - to => $mail_on_error, - from => $conf->invoice_from_full(), - subject => $subject, - body => $body, - ); + if ( $errors_not_fatal ) { + my $message = "Import from gateway ".$gateway->label." errors: ".$error_text; + my $log = FS::Log->new('FS::pay_batch::import_from_gateway'); + $log->error($message); } else { # Bail out. $dbh->rollback if $oldAutoCommit; |