From: Christopher Burger Date: Wed, 3 Jan 2018 00:47:44 +0000 (-0500) Subject: RT# 34134 - removed payment amount field from payment screen, added 3 payment options... X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=c187712be2bdaf85586bfcf6b4070dbe165a33dd;p=freeside.git RT# 34134 - removed payment amount field from payment screen, added 3 payment options (pay full balance, pay specific invoice, pay another amount) which will prefill the payment amount field. Conflicts: httemplate/elements/tr-select-payment_options.html --- diff --git a/httemplate/elements/tr-amount_fee.html b/httemplate/elements/tr-amount_fee.html index e3b8d7800..f174cf5cc 100644 --- a/httemplate/elements/tr-amount_fee.html +++ b/httemplate/elements/tr-amount_fee.html @@ -1,4 +1,4 @@ - + <% mt('Payment amount') |h %> + + + + +<%init> + +my %opt = @_; + + diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index b170da27b..f754f5a32 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -12,7 +12,8 @@
@@ -15,7 +15,7 @@ onKeyPress = "amount_changed(this)" % } > - + % if ( $fee ) { diff --git a/httemplate/elements/tr-select-invoice.html b/httemplate/elements/tr-select-invoice.html new file mode 100644 index 000000000..03625b659 --- /dev/null +++ b/httemplate/elements/tr-select-invoice.html @@ -0,0 +1,25 @@ + +
- <& /elements/tr-amount_fee.html, + <& /elements/tr-select-payment_options.html, + 'custnum' => $cust_main->custnum, 'amount' => $amount, 'process-pkgpart' => scalar($conf->config('manual_process-pkgpart', $cust_main->agentnum)),