diff options
| -rw-r--r-- | FS/FS/Conf.pm | 7 | ||||
| -rwxr-xr-x | httemplate/edit/cust_credit.cgi | 4 | 
2 files changed, 11 insertions, 0 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 43e7aaa3d..5bad05636 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -655,6 +655,13 @@ my %payment_gateway_options = (    },    { +    'key'         => 'credits-auto-apply-disable', +    'section'     => 'billing', +    'description' => 'Disable the "Auto-Apply to invoices" UI option for new credits', +    'type'        => 'checkbox', +  }, +   +  {      'key'         => 'credit-card-surcharge-percentage',      'section'     => 'billing',      'description' => 'Add a credit card surcharge to invoices, as a % of the invoice total. WARNING: this is usually prohibited by merchant account / other agreements and/or law, but is currently lawful in AU and UK.', diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi index 1238e9490..d5e53b8f1 100755 --- a/httemplate/edit/cust_credit.cgi +++ b/httemplate/edit/cust_credit.cgi @@ -40,10 +40,14 @@        <INPUT TYPE="text" NAME="addlinfo" VALUE="<% $cgi->param('addlinfo') |h %>">      </TD> +% if ( $conf->exists('credits-auto-apply-disable') ) { +        <INPUT TYPE="HIDDEN" NAME="apply" VALUE="no"> +% } else {    <TR>      <TD ALIGN="right">Auto-apply<BR>to invoices</TD>      <TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>    </TR> +% }  % if ( $conf->exists('pkg-balances') ) {    <% include('/elements/tr-select-cust_pkg-balances.html',  | 
