From: Ivan Kohler Date: Sat, 15 Feb 2014 23:56:57 +0000 (-0800) Subject: default credit limit, RT#27267 X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=ad9229b8b2934caa4af464e26cdb3349fb2e759b;p=freeside.git default credit limit, RT#27267 --- diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index f47d54db1..21026440d 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -5577,6 +5577,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 => "DEPRECATED", type => "text" }, { key => "apachemachine", section => "deprecated", description => "DEPRECATED", type => "text" }, { key => "apachemachines", section => "deprecated", description => "DEPRECATED", type => "text" }, diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index 5a66f0a60..d52fb3c40 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; } - credit_limit) %><% length($cust_main->credit_limit) ? '' : ' DISABLED' %>> - credit_limit) ? '' : ' CHECKED'%>> <% mt('Unlimited') |h %> + credit_limit) ? '' : ' DISABLED' %> + > +% my $default_credit_limit = $conf->config('default_credit_limit'); + credit_limit) ? '' : ' CHECKED'%> + > <% $default_credit_limit + ? "Default ($money_char". sprintf("%.2f", $default_credit_limit). + ")" + : mt('Unlimited') + |h + %> @@ -661,6 +676,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 LECB BILL CASH WEST COMP )) @payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP )) diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index 10cb1de88..749004d84 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -266,9 +266,13 @@ <% mt('Credit limit') |h %> - <% 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') + %>