[freeside-commits] branch FREESIDE_4_BRANCH updated. e6e941b0f73452f6207bb74bdda244630cda9e1e

[Christopher Burger]

The branch, FREESIDE_4_BRANCH has been updated
       via  e6e941b0f73452f6207bb74bdda244630cda9e1e (commit)
       via  98d491d009d8bc9000d6272aedaa0c315d0d9ffc (commit)
      from  ee32c5f35c41c7bc30a26b3217db3196ff5f39b7 (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 e6e941b0f73452f6207bb74bdda244630cda9e1e
Merge: 98d491d00 ee32c5f35
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon Jul 16 21:57:52 2018 -0400

    Merge branch 'FREESIDE_4_BRANCH' of ssh://git.freeside.biz/home/git/freeside into FREESIDE_4_BRANCH


commit 98d491d009d8bc9000d6272aedaa0c315d0d9ffc
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon Jul 16 14:40:39 2018 -0400

    RT# 74435 - added check, to make sure batch format can handle refunds

diff --git a/FS/FS/pay_batch/RBC.pm b/FS/FS/pay_batch/RBC.pm
index dea89cde1..3d1d98b17 100644
--- a/FS/FS/pay_batch/RBC.pm
+++ b/FS/FS/pay_batch/RBC.pm
@@ -228,5 +228,10 @@ $name = 'RBC';
   },
 );
 
+## this format can handle credit transactions
+sub can_handle_credits {
+  1;
+}
+
 1;
 
diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index c4bc37e93..c6a0b68c3 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -20,9 +20,18 @@ elsif ( $cgi->param('format') =~ /^([\w\- ]+)$/ ) {
   $opt{'format'} = $1;
 }
 
-my $pay_batch = qsearchs('pay_batch', { batchnum => $batchnum } );
+my $credit_transactions = "EXISTS (SELECT 1 FROM cust_pay_batch WHERE batchnum = $batchnum AND paycode = 'C') AS arecredits";
+my $pay_batch = qsearchs({ 'select'    => "*, $credit_transactions",
+                           'table'     => 'pay_batch',
+                           'hashref'   => { batchnum => $batchnum },
+                         });
 die "Batch not found: '$batchnum'" if !$pay_batch;
 
+if ($pay_batch->{Hash}->{arecredits}) {
+  my $export_format = "FS::pay_batch::".$opt{'format'};
+    die "This format can not handle refunds." unless $export_format->can('can_handle_credits');
+}
+
 my $exporttext = $pay_batch->export_batch(%opt);
 unless ($exporttext) {
   http_header('Content-Type' => 'text/html' );

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

Summary of changes:
 FS/FS/pay_batch/RBC.pm             |  5 +++++
 httemplate/misc/download-batch.cgi | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)