X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=79b7d8c936c7d104037c2db8bc784f3166b74c37;hp=7844ff0fd15c6d349dc73b678c4dfbb231663302;hb=67779831c7ac1bb6d65073a0e523453dacf751c6;hpb=6ac8854b766c9216584867ad15e1e31fb9da759e diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 7844ff0fd..79b7d8c93 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -8,6 +8,7 @@ use MIME::Base64; use FS::ConfItem; use FS::ConfDefaults; use FS::Conf_compat17; +use FS::Locales; use FS::payby; use FS::conf; use FS::Record qw(qsearch qsearchs); @@ -622,6 +623,13 @@ my %payment_gateway_options = ( }, { + 'key' => 'log_sent_mail', + 'section' => 'notification', + 'description' => 'Enable logging of template-generated email.', + 'type' => 'checkbox', + }, + + { 'key' => 'alert_expiration', 'section' => 'notification', 'description' => 'Enable alerts about billing method expiration (i.e. expiring credit cards).', @@ -655,6 +663,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.', @@ -667,13 +682,27 @@ my %payment_gateway_options = ( 'description' => 'Generate a line item on an invoice even when a package is discounted 100%', 'type' => 'checkbox', }, - + + { + 'key' => 'discount-show_available', + 'section' => 'billing', + 'description' => 'Show available prepayment discounts on invoices.', + 'type' => 'checkbox', + }, + { 'key' => 'invoice-barcode', 'section' => 'billing', 'description' => 'Display a barcode on HTML and PDF invoices', 'type' => 'checkbox', }, + + { + 'key' => 'cust_main-select-billday', + 'section' => 'billing', + 'description' => 'When used with a specific billing event, allows the selection of the day of month on which to charge credit card / bank account automatically, on a per-customer basis', + 'type' => 'checkbox', + }, { 'key' => 'encryption', @@ -736,7 +765,14 @@ my %payment_gateway_options = ( 'type' => 'text', 'per_agent' => 1, }, - + + { + 'key' => 'next-bill-ignore-time', + 'section' => 'billing', + 'description' => 'Ignore the time portion of next bill dates when billing, matching anything from 00:00:00 to 23:59:59 on the billing day.', + 'type' => 'checkbox', + }, + { 'key' => 'business-onlinepayment', 'section' => 'billing', @@ -791,6 +827,14 @@ my %payment_gateway_options = ( }, { + 'key' => 'business-onlinepayment-currency', + 'section' => 'billing', + 'description' => 'Currency parameter for Business::OnlinePayment transactions.', + 'type' => 'select', + 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD ) ], + }, + + { 'key' => 'countrydefault', 'section' => 'UI', 'description' => 'Default two-letter country code (if not supplied, the default is `US\')', @@ -1229,7 +1273,14 @@ and customer address. Include units.', { 'key' => 'invoice_print_pdf', 'section' => 'invoicing', - 'description' => 'Store postal invoices for download in PDF format rather than printing them directly.', + 'description' => 'For all invoice print operations, store postal invoices for download in PDF format rather than printing them directly.', + 'type' => 'checkbox', + }, + + { + 'key' => 'invoice_print_pdf-spoolagent', + 'section' => 'invoicing', + 'description' => 'Store postal invoices PDF downloads in per-agent spools.', 'type' => 'checkbox', }, @@ -1238,7 +1289,7 @@ and customer address. Include units.', 'section' => 'invoicing', 'description' => 'Optional default invoice term, used to calculate a due date printed on invoices.', 'type' => 'select', - 'select_enum' => [ '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 10', 'Net 15', 'Net 20', 'Net 21', 'Net 30', 'Net 45', 'Net 60', 'Net 90' ], + 'select_enum' => [ '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 9', 'Net 10', 'Net 15', 'Net 20', 'Net 21', 'Net 30', 'Net 45', 'Net 60', 'Net 90' ], }, { @@ -1318,6 +1369,14 @@ and customer address. Include units.', 'description' => 'Template to use for payment receipts.', %msg_template_options, }, + + { + 'key' => 'payment_receipt_from', + 'section' => 'notification', + 'description' => 'From: address for payment receipts, if not specified in the template.', + 'type' => 'text', + 'per_agent' => 1, + }, { 'key' => 'payment_receipt_email', @@ -1771,9 +1830,9 @@ and customer address. Include units.', { 'key' => 'locale', 'section' => 'UI', - 'description' => 'Message locale', + 'description' => 'Default locale', 'type' => 'select', - 'select_enum' => [ qw(en_US) ], + 'select_enum' => [ FS::Locales->locales ], }, { @@ -1799,22 +1858,17 @@ and customer address. Include units.', }, { + 'key' => 'default_agentnum', + 'section' => 'UI', + 'description' => 'Default agent for the backoffice', + 'type' => 'select-agent', + }, + + { 'key' => 'signup_server-default_agentnum', 'section' => 'self-service', 'description' => 'Default agent for the signup server', - 'type' => 'select-sub', - 'options_sub' => sub { require FS::Record; - require FS::agent; - map { $_->agentnum => $_->agent } - FS::Record::qsearch('agent', { disabled=>'' } ); - }, - 'option_sub' => sub { require FS::Record; - require FS::agent; - my $agent = FS::Record::qsearchs( - 'agent', { 'agentnum'=>shift } - ); - $agent ? $agent->agent : ''; - }, + 'type' => 'select-agent', }, { @@ -2508,7 +2562,7 @@ and customer address. Include units.', { 'key' => 'ticket_system', - 'section' => '', + 'section' => 'ticketing', 'description' => 'Ticketing system integration. RT_Internal uses the built-in RT ticketing system (see the integrated ticketing installation instructions). RT_External accesses an external RT installation in a separate database (local or remote).', 'type' => 'select', #'select_enum' => [ '', qw(RT_Internal RT_Libs RT_External) ], @@ -2526,7 +2580,7 @@ and customer address. Include units.', { 'key' => 'ticket_system-default_queueid', - 'section' => '', + 'section' => 'ticketing', 'description' => 'Default queue used when creating new customer tickets.', 'type' => 'select-sub', 'options_sub' => sub { @@ -2552,13 +2606,13 @@ and customer address. Include units.', }, { 'key' => 'ticket_system-force_default_queueid', - 'section' => '', + 'section' => 'ticketing', 'description' => 'Disallow queue selection when creating new tickets from customer view.', 'type' => 'checkbox', }, { 'key' => 'ticket_system-selfservice_queueid', - 'section' => '', + 'section' => 'ticketing', 'description' => 'Queue used when creating new customer tickets from self-service. Defautls to ticket_system-default_queueid if not specified.', #false laziness w/above 'type' => 'select-sub', @@ -2586,49 +2640,63 @@ and customer address. Include units.', { 'key' => 'ticket_system-requestor', - 'section' => '', + 'section' => 'ticketing', 'description' => 'Email address to use as the requestor for new tickets. If blank, the customer\'s invoicing address(es) will be used.', 'type' => 'text', }, { 'key' => 'ticket_system-priority_reverse', - 'section' => '', + 'section' => 'ticketing', 'description' => 'Enable this to consider lower numbered priorities more important. A bad habit we picked up somewhere. You probably want to avoid it and use the default.', 'type' => 'checkbox', }, { 'key' => 'ticket_system-custom_priority_field', - 'section' => '', + 'section' => 'ticketing', 'description' => 'Custom field from the ticketing system to use as a custom priority classification.', 'type' => 'text', }, { 'key' => 'ticket_system-custom_priority_field-values', - 'section' => '', + 'section' => 'ticketing', 'description' => 'Values for the custom field from the ticketing system to break down and sort customer ticket lists.', 'type' => 'textarea', }, { 'key' => 'ticket_system-custom_priority_field_queue', - 'section' => '', + 'section' => 'ticketing', 'description' => 'Ticketing system queue in which the custom field specified in ticket_system-custom_priority_field is located.', 'type' => 'text', }, { + 'key' => 'ticket_system-selfservice_priority_field', + 'section' => 'ticketing', + 'description' => 'Custom field from the ticket system to use as a customer-managed priority field.', + 'type' => 'text', + }, + + { + 'key' => 'ticket_system-selfservice_edit_subject', + 'section' => 'ticketing', + 'description' => 'Allow customers to edit ticket subjects through selfservice.', + 'type' => 'checkbox', + }, + + { 'key' => 'ticket_system-escalation', - 'section' => '', + 'section' => 'ticketing', 'description' => 'Enable priority escalation of tickets as part of daily batch processing.', 'type' => 'checkbox', }, { 'key' => 'ticket_system-rt_external_datasrc', - 'section' => '', + 'section' => 'ticketing', 'description' => 'With external RT integration, the DBI data source for the external RT installation, for example, DBI:Pg:user=rt_user;password=rt_word;host=rt.example.com;dbname=rt', 'type' => 'text', @@ -2636,7 +2704,7 @@ and customer address. Include units.', { 'key' => 'ticket_system-rt_external_url', - 'section' => '', + 'section' => 'ticketing', 'description' => 'With external RT integration, the URL for the external RT installation, for example, https://rt.example.com/rt', 'type' => 'text', }, @@ -2809,9 +2877,22 @@ and customer address. Include units.', { 'key' => 'overlimit_groups', 'section' => '', - 'description' => 'RADIUS group (or comma-separated groups) to assign to svc_acct which has exceeded its bandwidth or time limit.', - 'type' => 'text', + 'description' => 'RADIUS group(s) to assign to svc_acct which has exceeded its bandwidth or time limit.', + 'type' => 'select-sub', 'per_agent' => 1, + 'multiple' => 1, + 'options_sub' => sub { require FS::Record; + require FS::radius_group; + map { $_->groupnum => $_->long_description } + FS::Record::qsearch('radius_group', {} ); + }, + 'option_sub' => sub { require FS::Record; + require FS::radius_group; + my $radius_group = FS::Record::qsearchs( + 'radius_group', { 'groupnum' => shift } + ); + $radius_group ? $radius_group->long_description : ''; + }, }, { @@ -2846,7 +2927,7 @@ and customer address. Include units.', { 'key' => 'cust_pkg-show_fcc_voice_grade_equivalent', 'section' => 'UI', - 'description' => "Show a field on package definitions for assigning a DSO equivalency number suitable for use on FCC form 477.", + 'description' => "Show a field on package definitions for assigning a DS0 equivalency number suitable for use on FCC form 477.", 'type' => 'checkbox', }, @@ -2872,6 +2953,13 @@ and customer address. Include units.', }, { + 'key' => 'svc_acct-no_edit_username', + 'section' => 'shell', + 'description' => 'Disallow username editing.', + 'type' => 'checkbox', + }, + + { 'key' => 'zone-underscore', 'section' => 'BIND', 'description' => 'Allow underscores in zone names. As underscores are illegal characters in zone names, this option is not recommended.', @@ -2886,6 +2974,20 @@ and customer address. Include units.', }, { + 'key' => 'echeck-no_routing', + 'section' => 'billing', + 'description' => 'Disable the routing number entirely for Electronic Check payment info.', + 'type' => 'checkbox', + }, + + { + 'key' => 'voip-cust_accountcode_cdr', + 'section' => 'telephony', + 'description' => 'Enable the per-customer option for CDR breakdown by accountcode.', + 'type' => 'checkbox', + }, + + { 'key' => 'voip-cust_cdr_spools', 'section' => 'telephony', 'description' => 'Enable the per-customer option for individual CDR spools.', @@ -2981,6 +3083,7 @@ and customer address. Include units.', 'section' => 'billing', 'description' => 'This allows selection of a package to insert on invoices for customers with postal invoices selected.', 'type' => 'select-part_pkg', + 'per_agent' => 1, }, { @@ -3041,7 +3144,8 @@ and customer address. Include units.', 'description' => 'Fixed (unchangeable) format for electronic check batches.', 'type' => 'select', 'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', 'BoM', 'PAP', - 'paymentech', 'ach-spiritone', 'RBC', 'td_eft1464' + 'paymentech', 'ach-spiritone', 'RBC', 'td_eft1464', + 'eft_canada' ] }, @@ -3102,6 +3206,13 @@ and customer address. Include units.', }, { + 'key' => 'batchconfig-eft_canada', + 'section' => 'billing', + 'description' => 'Configuration for EFT Canada batching, four lines: 1. SFTP username, 2. SFTP password, 3. Transaction code, 4. Number of days to delay process date.', + 'type' => 'textarea', + }, + + { 'key' => 'payment_history-years', 'section' => 'UI', 'description' => 'Number of years of payment history to show by default. Currently defaults to 2.', @@ -3830,6 +3941,13 @@ and customer address. Include units.', 'type' => 'image', 'per_agent' => 1, }, + + { + 'key' => 'selfservice-view_usage_nodomain', + 'section' => 'self-service', + 'description' => 'Show usernames without their domains in "View my usage" in the self-service interface.', + 'type' => 'checkbox', + }, { 'key' => 'selfservice-bulk_format', @@ -3865,11 +3983,18 @@ and customer address. Include units.', { 'key' => 'signup-recommend_daytime', 'section' => 'self-service', - 'description' => 'Encourage the entry of a daytime phone number invoicing email address on signup.', + 'description' => 'Encourage the entry of a daytime phone number on signup.', 'type' => 'checkbox', }, { + 'key' => 'signup-duplicate_cc-warn_hours', + 'section' => 'self-service', + 'description' => 'Issue a warning if the same credit card is used for multiple signups within this many hours.', + 'type' => 'text', + }, + + { 'key' => 'svc_phone-radius-default_password', 'section' => 'telephony', 'description' => 'Default password when exporting svc_phone records to RADIUS', @@ -4318,7 +4443,7 @@ and customer address. Include units.', { 'key' => 'svc_phone-did-summary', 'section' => 'invoicing', - 'description' => 'Enable DID activity summary for past 30 days on invoices, showing # DIDs activated/deactivated/ported-in/ported-out and total minutes usage', + 'description' => 'Enable DID activity summary on invoices, showing # DIDs activated/deactivated/ported-in/ported-out and total minutes usage, covering period since last invoice.', 'type' => 'checkbox', }, @@ -4357,6 +4482,13 @@ and customer address. Include units.', }, { + 'key' => 'cust_bill-latex_lineitem_maxlength', + 'section' => 'invoicing', + 'description' => 'Truncate long line items to this number of characters on typeset invoices, to avoid losing things off the right margin. Defaults to 50. ', + 'type' => 'text', + }, + + { 'key' => 'cust_main-status_module', 'section' => 'UI', 'description' => 'Which module to use for customer status display. The "Classic" module (the default) considers accounts with cancelled recurring packages but un-cancelled one-time charges Inactive. The "Recurring" module considers those customers Cancelled. Similarly for customers with suspended recurring packages but one-time charges.', #other differences? @@ -4379,6 +4511,60 @@ and customer address. Include units.', 'select_enum' => [ '', '7', 'EmulateIE7', '8', 'EmulateIE8' ], }, + { + 'key' => 'disable_payauto_default', + 'section' => 'UI', + 'description' => 'Disable the "Charge future payments to this (card|check) automatically" checkbox from defaulting to checked.', + 'type' => 'checkbox', + }, + + { + 'key' => 'payment-history-report', + 'section' => 'UI', + 'description' => 'Show a link to the payment history report in the Reports menu. DO NOT ENABLE THIS.', + 'type' => 'checkbox', + }, + + { + 'key' => 'svc_broadband-require-nw-coordinates', + 'section' => 'UI', + 'description' => 'On svc_broadband add/edit, require latitude and longitude in the North Western quadrant, e.g. for North American co-ordinates, etc.', + 'type' => 'checkbox', + }, + + { + 'key' => 'cust-email-high-visibility', + 'section' => 'UI', + 'description' => 'Move the invoicing e-mail address field to the top of the billing address section and highlight it.', + 'type' => 'checkbox', + }, + + { + 'key' => 'cust_main-require-bank-branch', + 'section' => 'UI', + 'description' => 'An alternate DCHK/CHEK format; require entry of bank branch number.', + 'type' => 'checkbox', + }, + + { + 'key' => 'cust-edit-alt-field-order', + 'section' => 'UI', + 'description' => 'An alternate ordering of fields for the New Customer and Edit Customer screens.', + 'type' => 'checkbox', + }, + + { + 'key' => 'translate-auto-insert', + 'section' => '', + 'description' => 'Auto-insert untranslated strings for selected non-en_US locales with their default/en_US values. DO NOT TURN THIS ON.', + 'type' => 'select-sub', + 'multiple' => 1, + 'options_sub' => sub { map { $_ => '' } + grep { $_ ne 'en_US' } FS::Locales::locales; + }, + 'option_sub' => sub { ''; }, + }, + { key => "apacheroot", section => "deprecated", description => "DEPRECATED", type => "text" }, { key => "apachemachine", section => "deprecated", description => "DEPRECATED", type => "text" }, { key => "apachemachines", section => "deprecated", description => "DEPRECATED", type => "text" },