diff options
| -rw-r--r-- | FS/FS/Conf.pm | 7 | ||||
| -rw-r--r-- | httemplate/edit/cust_main/billing.html | 21 | ||||
| -rw-r--r-- | httemplate/view/cust_main/billing.html | 10 |
3 files changed, 33 insertions, 5 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index d8c29f364..48b39c5b2 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -5599,6 +5599,13 @@ and customer address. Include units.', 'type' => 'checkbox', }, + { + 'key' => 'default_credit_limit', + 'section' => 'billing', + 'description' => 'Default customer credit limit', + 'type' => 'text', + }, + { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" }, { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" }, { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" }, diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index 1088cf5fd..16ddb2e19 100644 --- a/httemplate/edit/cust_main/billing.html +++ b/httemplate/edit/cust_main/billing.html @@ -559,8 +559,23 @@ function toggle(obj) { obj.form.credit_limit.disabled = obj.checked; } </SCRIPT> - <INPUT TYPE="text" NAME="credit_limit" VALUE=<% sprintf('"%.2f"', $cust_main->credit_limit) %><% length($cust_main->credit_limit) ? '' : ' DISABLED' %>> - <INPUT TYPE="checkbox" NAME="no_credit_limit" VALUE=1 onclick="toggle(this)"<% length($cust_main->credit_limit) ? '' : ' CHECKED'%>> <% mt('Unlimited') |h %> + <INPUT TYPE = "text" + NAME = "credit_limit" + VALUE = "<% sprintf('%.2f', $cust_main->credit_limit) %>" + <% length($cust_main->credit_limit) ? '' : ' DISABLED' %> + > +% my $default_credit_limit = $conf->config('default_credit_limit'); + <INPUT TYPE = "checkbox" + NAME = "no_credit_limit" + VALUE = 1 + onClick="toggle(this)" + <% length($cust_main->credit_limit) ? '' : ' CHECKED'%> + > <% $default_credit_limit + ? "Default ($money_char". sprintf("%.2f", $default_credit_limit). + ")" + : mt('Unlimited') + |h + %> </TD> </TR> @@ -678,6 +693,8 @@ my $payinfo = $options{'payinfo'}; my $conf = new FS::Conf; my $payby_default = $conf->config('payby-default'); +my $money_char = $conf->config('money_char') || '$'; + my @payby = grep /\w/, $conf->config('payby'); #@payby = (qw( CARD DCRD CHEK DCHK BILL CASH WEST COMP )) @payby = (qw( CARD DCRD CHEK DCHK BILL CASH COMP )) diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index e0dd7b904..382fdacf5 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -266,9 +266,13 @@ <TR> <TD ALIGN="right"><% mt('Credit limit') |h %></TD> <TD BGCOLOR="#ffffff"> - <% length($cust_main->credit_limit) ? - $money_char.sprintf("%.2f", $cust_main->credit_limit) : - emt('Unlimited') %> +% my $default_credit_limit = $conf->config('default_credit_limit'); + <% length($cust_main->credit_limit) + ? $money_char. sprintf("%.2f", $cust_main->credit_limit) + : $default_credit_limit + ? "Default ($money_char". sprintf("%.2f", $default_credit_limit). ")" + : emt('Unlimited') + %> </TD> </TR> |