diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2017-05-30 14:56:40 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2017-05-30 14:56:40 -0700 |
| commit | 4f010c8c1b354eee79db1ff628eb2a1ef9274d2e (patch) | |
| tree | 823dafaad3081b2f0d46d52889a979cc7ae474af | |
| parent | b25b04ebba149ac5257a693fbcb555a46d379a0f (diff) | |
error on batch insert is returned to user, not fatal, RT#75998
| -rw-r--r-- | FS/FS/cust_main/Billing_Batch.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/FS/FS/cust_main/Billing_Batch.pm b/FS/FS/cust_main/Billing_Batch.pm index d8e6f8a35..48854d3ed 100644 --- a/FS/FS/cust_main/Billing_Batch.pm +++ b/FS/FS/cust_main/Billing_Batch.pm @@ -89,7 +89,7 @@ sub batch_card { #this needs to handle mysql as well as Pg, like svc_acct.pm #(make it into a common function if folks need to do batching with mysql) $dbh->do("LOCK TABLE pay_batch IN SHARE ROW EXCLUSIVE MODE") - or return "Cannot lock pay_batch: " . $dbh->errstr; + or die "Cannot lock pay_batch: " . $dbh->errstr; my %pay_batch = ( 'status' => 'O', @@ -156,7 +156,8 @@ sub batch_card { if ( $error ) { $dbh->rollback if $oldAutoCommit; - die $error; + #die $error; + return $error; # e.g. "Illegal zip" ala RT#75998 } my $unapplied = $self->total_unapplied_credits |