From: Christopher Burger Date: Sat, 12 May 2018 00:44:16 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2eea268a59cf357853e31ff8d5db6033e4bdc8ea;hp=4171d4440a6bf042f342095f13439a5f9d27487d Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside --- diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index de060b010..4f6f7ef75 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -25,7 +25,7 @@ ? scalar($conf->config('credit-card-surcharge-percentage', $cust_main->agentnum)) : 0 ), - 'surcharge_flatfee:Q' => + 'surcharge_flatfee' => ( $payby eq 'CARD' ? scalar($conf->config('credit-card-surcharge-flatfee', $cust_main->agentnum)) : 0