[freeside-commits] branch master updated. 814e5db9cd3953afad6ee1901574180fa0890062

[Christopher Burger]

The branch, master has been updated
       via  814e5db9cd3953afad6ee1901574180fa0890062 (commit)
      from  8f20806ac6eb7487c97f7d1c6d1b44acf0ad7674 (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 814e5db9cd3953afad6ee1901574180fa0890062
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed Jan 3 09:49:58 2018 -0500

    RT# 34134 - removed config option manual_process-single_invoice_amount from config and payment page that used it.

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 59f9b69fc..9b891879b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2753,13 +2753,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'manual_process-single_invoice_amount',
-    'section'     => 'payments',
-    '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'     => 'payments',
     'description' => 'Package to add to each manual credit card and ACH payment entered by employees from the backend.  WARNING: Although recently permitted to US merchants in general, specific consumer protection laws may prohibit or restrict this practice in California, Colorado, Connecticut, Florda, Kansas, Maine, Massachusetts, New York, Oklahome, and Texas. Surcharging is also generally prohibited in most countries outside the US, AU and UK.',
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 7bf1713ff..5bfa29d70 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -14,7 +14,7 @@
 
   <& /elements/tr-select-payment_options.html,
        'custnum'            => $cust_main->custnum,
-       'amount'             => $amount,
+       'amount'             => $balance,
        'process-pkgpart'    => 
           scalar($conf->config('manual_process-pkgpart', $cust_main->agentnum)),
        'process-display'    => scalar($conf->config('manual_process-display')),
@@ -357,15 +357,6 @@ my %states = map { $_->state => 1 }
                } );
 my @states = sort { $a cmp $b } keys %states;
 
-my $amount = '';
-if ( $balance > 0 ) {
-  # when configured to do so, amount will only auto-fill with balance
-  # if balance represents a single invoice
-  $amount = $balance
-    unless $conf->exists('manual_process-single_invoice_amount')
-      && ($cust_main->open_cust_bill != 1);
-}
-
 my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32;
 
 </%init>

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

Summary of changes:
 FS/FS/Conf.pm               |  7 -------
 httemplate/misc/payment.cgi | 11 +----------
 2 files changed, 1 insertion(+), 17 deletions(-)