X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=9e68ffc6720702791e04573d8232bacf11bb2395;hb=d154235405427300ea88c9763271555252fdc916;hp=393f068e95ef92dc5b57d3751f62f21914ce855a;hpb=8ddf2ae7b5e02463c87599186f0279b86ddaeaac;p=freeside.git diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 393f068e9..9e68ffc67 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2683,6 +2683,17 @@ and customer address. Include units.', }, { + 'key' => 'processing-fee_on_separate_invoice', + 'section' => 'payments', + 'description' => 'Places the processing fee on a separate invoice by itself. Only works with real time processing.', + 'type' => 'checkbox', + 'validate' => sub { + my $conf = new FS::Conf; + !$conf->config('batch-enable_payby') ? '' : 'You can not set this option while batch processing is enabled.'; + }, + }, + + { 'key' => 'banned_pay-pad', 'section' => 'credit_cards', 'description' => 'Padding for encrypted storage of banned credit card hashes. If you already have new-style SHA512 entries in the banned_pay table, do not change as this will invalidate the old entries.', @@ -3840,6 +3851,11 @@ and customer address. Include units.', 'description' => 'Enable batch processing for the specified payment types.', 'type' => 'selectmultiple', 'select_enum' => [qw( CARD CHEK )], + 'validate' => sub { + ## can not create a new invoice and pay it silently with batch processing, only realtime processing. + my $conf = new FS::Conf; + !$conf->exists('processing-fee_on_separate_invoice') ? '' : 'You can not enable batch processing while processing-fee_on_separate_invoice option is enabled.'; + }, }, { @@ -5997,12 +6013,19 @@ and customer address. Include units.', { 'key' => 'agent-disable_counts', - 'section' => 'scalability', + 'section' => 'deprecated', 'description' => 'On the agent browse page, disable the customer and package counts. Typically used for very large installs when this page takes too long to render.', 'type' => 'checkbox', }, { + 'key' => 'config-disable_counts', + 'section' => 'scalability', + 'description' => 'Disable the customer and package counts on the Agents, Packages, and Services pages. Use for very large installs where these pages take too long to render.', + 'type' => 'checkbox', + }, + + { 'key' => 'tollfree-country', 'section' => 'telephony', 'description' => 'Country / region for toll-free recognition',