diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2018-01-03 09:49:58 -0500 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2018-06-19 12:45:36 -0400 |
| commit | dcb7068e87e2130f939f6e83c3d40187ad39863a (patch) | |
| tree | 8ad015f733349f362bf8ed3b2d11383130e939c4 | |
| parent | 929f727a3d09b7f4d4918fc6b15aade1a0e43ce6 (diff) | |
RT# 34134 - removed config option manual_process-single_invoice_amount from config and payment page that used it.
Conflicts:
httemplate/misc/payment.cgi
| -rw-r--r-- | FS/FS/Conf.pm | 7 | ||||
| -rw-r--r-- | httemplate/misc/payment.cgi | 11 |
2 files changed, 1 insertions, 17 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 36b330c91..50c0a5d83 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2805,13 +2805,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 f754f5a32..80cb15d79 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')), @@ -187,15 +187,6 @@ my $payinfo = ''; my $conf = new FS::Conf; -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> |