X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fpayment.cgi;h=2f76b85f143e04ce5ac0b2e5002658033fc73c28;hb=be4379d3f8238376f913337b6402dd8b6167913a;hp=b4e3a6f8213314e601ad3288e7b75301c451e3f6;hpb=7acc76e0ead0d88cb225c88016c778c8feb9a075;p=freeside.git diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index b4e3a6f82..2f76b85f1 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -12,17 +12,24 @@ <& /elements/tr-amount_fee.html, 'amount' => $amount, - 'process-pkgpart' => scalar($conf->config('manual_process-pkgpart')), + 'process-pkgpart' => + scalar($conf->config('manual_process-pkgpart', $cust_main->agentnum)), 'process-display' => scalar($conf->config('manual_process-display')), 'process-skip_first' => $conf->exists('manual_process-skip_first'), 'num_payments' => scalar($cust_main->cust_pay), - 'surcharge_percentage' => scalar($conf->config('credit-card-surcharge-percentage')), + 'surcharge_percentage' => + ( $payby eq 'CARD' + ? scalar($conf->config('credit-card-surcharge-percentage')) + : 0 + ), &> - <& /elements/tr-select-discount_term.html, - 'custnum' => $custnum, - 'amount_id' => 'amount', - &> +% if ( $conf->exists('part_pkg-term_discounts') ) { + <& /elements/tr-select-discount_term.html, + 'custnum' => $custnum, + 'amount_id' => 'amount', + &> +% } % if ( $payby eq 'CARD' ) { % @@ -197,11 +204,13 @@ +% my $disallow_no_auto_apply = 0; % if ( $conf->exists("batch-enable") % || grep $payby eq $_, $conf->config('batch-enable_payby') % ) { % % if ( grep $payby eq $_, $conf->config('realtime-disable_payby') ) { +% $disallow_no_auto_apply = 1; @@ -209,7 +218,7 @@