add manual_process-skip_first option, RT#5889

1 files changed, 4 insertions, 3 deletions

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index ada925c55..8d7baa5da 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -300,9 +300,10 @@ my $fee = '';
 my $fee_pkg = '';
 my $fee_display = '';
 my $fee_op = '';
-if ( $conf->config('manual_process-pkgpart') ) {
-
-  last if $conf->exists('manual_process-skip_first') && ! $cust_main->cust_pay;
+if ( $conf->config('manual_process-pkgpart')
+     and ! $conf->exists('manual_process-skip_first') || $cust_main->cust_pay
+   )
+{
 
   $fee_display = $conf->config('manual_process-display') || 'add';
   $fee_op = $fee_display eq 'add' ? '+' : '-';