[freeside-commits] branch master updated. 90e334773bc11bba47ab857530ff602009f4c4ce

[Christopher Burger]

The branch, master has been updated
       via  90e334773bc11bba47ab857530ff602009f4c4ce (commit)
      from  b48c02a92562395c84dbfe8c47db5c4ba14891a0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 90e334773bc11bba47ab857530ff602009f4c4ce
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon Mar 11 11:13:28 2019 -0400

    RT# 82988 - fixed resolve credit batches from RBC

diff --git a/FS/FS/pay_batch/RBC.pm b/FS/FS/pay_batch/RBC.pm
index 7c165a315..691e2a2af 100644
--- a/FS/FS/pay_batch/RBC.pm
+++ b/FS/FS/pay_batch/RBC.pm
@@ -94,22 +94,17 @@ $name = 'RBC';
   },
   'begin_condition' => sub {
       my $hash = shift;
-      # Debit Detail Record
-      if ($hash->{recordtype} eq '1') {
+      # Detail Record
+      if ($hash->{recordtype} eq '1' || $hash->{recordtype} eq '2') {
         $declined = {};
         $totaloffset = 0;
         return 1;
-      # Credit Detail Record, will immediately trigger end condition & error
-      } elsif ($hash->{recordtype} eq '2') { 
-        return 1;
       } else {
         return 0;
       }
   },
   'end_hook'    => sub {
       my( $hash, $total, $line ) = @_;
-      return "Can't process Credit Detail Record, aborting import"
-        if ($hash->{'recordtype'} eq '2');
       $total += $totaloffset;
       $total = sprintf("%.2f", $total);
       # We assume here that this is an 'All Records' or 'Input Records' report.
@@ -120,8 +115,7 @@ $name = 'RBC';
   },
   'end_condition' => sub {
       my $hash = shift;
-      return ($hash->{recordtype} eq '4')  # Client Trailer Record
-          || ($hash->{recordtype} eq '2'); # Credit Detail Record, will throw error in end_hook
+      return ($hash->{recordtype} eq '4');  # Client Trailer Record
   },
   'skip_condition' => sub {
       my $hash = shift;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/pay_batch/RBC.pm | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)