[freeside-commits] branch master updated. fb3f24328beb8e4d8703ea0d5376cdaaa86533a0

[Jonathan Prykop]

The branch, master has been updated
       via  fb3f24328beb8e4d8703ea0d5376cdaaa86533a0 (commit)
      from  048756865bec53d4c5fd7e2b6240ea8ecd583eaa (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 fb3f24328beb8e4d8703ea0d5376cdaaa86533a0
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed Apr 22 19:46:28 2015 -0500

    RT#34134: Processing a Credit Card Payment on Accounts

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index a37e5a6..c5c03ff 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2854,6 +2854,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'manual_process-single_invoice_amount',
+    'section'     => 'billing',
+    'description' => 'When entering manual credit card and ACH payments, amount will not autofill if the customer has more than one open invoice',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'manual_process-pkgpart',
     'section'     => 'billing',
     'description' => 'Package to add to each manual credit card and ACH payment entered by employees from the backend.  Enabling this option may be in violation of your merchant agreement(s), so please check it(/them) carefully before enabling this option.',
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 90b03c7..b83ad71 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -273,7 +273,9 @@ my @states = sort { $a cmp $b } keys %states;
 
 my $amount = '';
 if ( $balance > 0 ) {
-  $amount = $balance;
+  $amount = $balance
+    unless $conf->exists('manual_process-single_invoice_amount')
+      && ($cust_main->open_cust_bill != 1);
 }
 
 my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32;

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

Summary of changes:
 FS/FS/Conf.pm               |    7 +++++++
 httemplate/misc/payment.cgi |    4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)