X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=503aebd22003c24c7c23c94c78fc461d902b56aa;hb=e3cece3253b4540e18996502a9d41bb69f7f0688;hp=be4c7441328b42ab1e21c0bed206494348d51d4a;hpb=357b4e26965895666685590d59f72de331fecb08;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index be4c74413..503aebd22 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -146,7 +146,7 @@ sub config_binary {
return $self->_usecompat('config_binary', @_) if use_confcompat;
my $cv = $self->_config(@_) or return;
- decode_base64($cv->value);
+ length($cv->value) ? decode_base64($cv->value) : '';
}
=item exists KEY [ AGENTNUM [ NODEFAULT ] ]
@@ -230,6 +230,7 @@ sub invoice_templatenames {
}
}
+ map { $_ } #handle scalar context
sort keys %templatenames;
}
@@ -576,7 +577,7 @@ worry that config_items is freeside-specific and icky.
{
'key' => 'alert_expiration',
'section' => 'billing',
- 'description' => 'Enable alerts about billing method expiration.',
+ 'description' => 'Enable alerts about billing method expiration (i.e. expiring credit cards).',
'type' => 'checkbox',
'per_agent' => 1,
},
@@ -584,7 +585,7 @@ worry that config_items is freeside-specific and icky.
{
'key' => 'alerter_template',
'section' => 'billing',
- 'description' => 'Template file for billing method expiration alerts. See the billing documentation for details.',
+ 'description' => 'Template file for billing method expiration alerts (i.e. expiring credit cards). See the billing documentation for details.',
'type' => 'textarea',
'per_agent' => 1,
},
@@ -689,7 +690,7 @@ worry that config_items is freeside-specific and icky.
{
'key' => 'business-onlinepayment-description',
'section' => 'billing',
- 'description' => 'String passed as the description field to Business::OnlinePayment. Evaluated as a double-quoted perl string, with the following variables available: $agent (the agent name), and $pkgs (a comma-separated list of packages for which these charges apply)',
+ 'description' => 'String passed as the description field to Business::OnlinePayment. Evaluated as a double-quoted perl string, with the following variables available: $agent (the agent name), and $pkgs (a comma-separated list of packages for which these charges apply - not available in all situations)',
'type' => 'text',
},
@@ -809,35 +810,42 @@ worry that config_items is freeside-specific and icky.
'key' => 'editreferrals',
'section' => 'UI',
'description' => 'Enable advertising source modification for existing customers',
- 'type' => 'checkbox',
+ 'type' => 'checkbox',
},
{
'key' => 'emailinvoiceonly',
'section' => 'billing',
'description' => 'Disables postal mail invoices',
- 'type' => 'checkbox',
+ 'type' => 'checkbox',
},
{
'key' => 'disablepostalinvoicedefault',
'section' => 'billing',
'description' => 'Disables postal mail invoices as the default option in the UI. Be careful not to setup customers which are not sent invoices. See emailinvoiceauto.',
- 'type' => 'checkbox',
+ 'type' => 'checkbox',
},
{
'key' => 'emailinvoiceauto',
'section' => 'billing',
'description' => 'Automatically adds new accounts to the email invoice list',
- 'type' => 'checkbox',
+ 'type' => 'checkbox',
},
{
'key' => 'emailinvoiceautoalways',
'section' => 'billing',
'description' => 'Automatically adds new accounts to the email invoice list even when the list contains email addresses',
- 'type' => 'checkbox',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'emailinvoice-apostrophe',
+ 'section' => 'billing',
+ 'description' => 'Allows the apostrophe (single quote) character in the email addresses in the email invoice list.',
+ 'type' => 'checkbox',
},
{
@@ -1022,29 +1030,45 @@ worry that config_items is freeside-specific and icky.
},
{
+ 'key' => 'invoice_show_prior_due_date',
+ 'section' => 'billing',
+ 'description' => 'Show previous invoice due dates when showing prior balances. Default is to show invoice date.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'invoice_include_aging',
+ 'section' => 'billing',
+ 'description' => 'Show an aging line after the prior balance section. Only valud when invoice_sections is enabled.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'invoice_sections',
'section' => 'billing',
'description' => 'Split invoice into sections and label according to package category when enabled.',
'type' => 'checkbox',
},
+ {
+ 'key' => 'usage_class_as_a_section',
+ 'section' => 'billing',
+ 'description' => 'Split usage into sections and label according to usage class name when enabled. Only valid when invoice_sections is enabled.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'svc_phone_sections',
+ 'section' => 'billing',
+ 'description' => 'Create a section for each svc_phone when enabled. Only valid when invoice_sections is enabled.',
+ 'type' => 'checkbox',
+ },
+
{
'key' => 'finance_pkgclass',
'section' => 'billing',
- 'description' => 'The package class for finance charges',
- 'type' => 'select-sub',
- 'options_sub' => sub { require FS::Record;
- require FS::pkg_class;
- map { $_->classnum => $_->classname }
- FS::Record::qsearch('pkg_class', {} );
- },
- 'option_sub' => sub { require FS::Record;
- require FS::pkg_class;
- my $pkg_class = FS::Record::qsearchs(
- 'pkg_class', { 'classnum'=>shift }
- );
- $pkg_class ? $pkg_class->classname : '';
- },
+ 'description' => 'The default package class for late fee charges, used if the fee event does not specify a package class itself.',
+ 'type' => 'select-pkg_class',
},
{
@@ -1134,17 +1158,34 @@ worry that config_items is freeside-specific and icky.
},
{
- 'key' => 'password-noampersand',
- 'section' => 'password',
+ 'key' => 'password-noampersand',
+ 'section' => 'password',
'description' => 'Disallow ampersands in passwords',
- 'type' => 'checkbox',
+ 'type' => 'checkbox',
},
{
- 'key' => 'password-noexclamation',
- 'section' => 'password',
+ 'key' => 'password-noexclamation',
+ 'section' => 'password',
'description' => 'Disallow exclamations in passwords (Not setting this could break old text Livingston or Cistron Radius servers)',
- 'type' => 'checkbox',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'default-password-encoding',
+ 'section' => 'password',
+ 'description' => 'Default storage format for passwords',
+ 'type' => 'select',
+ 'select_hash' => [
+ 'plain' => 'Plain text',
+ 'crypt-des' => 'Unix password (DES encrypted)',
+ 'crypt-md5' => 'Unix password (MD5 digest)',
+ 'ldap-plain' => 'LDAP (plain text)',
+ 'ldap-crypt' => 'LDAP (DES encrypted)',
+ 'ldap-md5' => 'LDAP (MD5 digest)',
+ 'ldap-sha1' => 'LDAP (SHA1 digest)',
+ 'legacy' => 'Legacy mode',
+ ],
},
{
@@ -1539,38 +1580,14 @@ worry that config_items is freeside-specific and icky.
'key' => 'signup_server-classnum2',
'section' => '',
'description' => 'Package Class for first optional purchase',
- 'type' => 'select-sub',
- 'options_sub' => sub { require FS::Record;
- require FS::pkg_class;
- map { $_->classnum => $_->classname }
- FS::Record::qsearch('pkg_class', {} );
- },
- 'option_sub' => sub { require FS::Record;
- require FS::pkg_class;
- my $pkg_class = FS::Record::qsearchs(
- 'pkg_class', { 'classnum'=>shift }
- );
- $pkg_class ? $pkg_class->classname : '';
- },
+ 'type' => 'select-pkg_class',
},
{
'key' => 'signup_server-classnum3',
'section' => '',
'description' => 'Package Class for second optional purchase',
- 'type' => 'select-sub',
- 'options_sub' => sub { require FS::Record;
- require FS::pkg_class;
- map { $_->classnum => $_->classname }
- FS::Record::qsearch('pkg_class', {} );
- },
- 'option_sub' => sub { require FS::Record;
- require FS::pkg_class;
- my $pkg_class = FS::Record::qsearchs(
- 'pkg_class', { 'classnum'=>shift }
- );
- $pkg_class ? $pkg_class->classname : '';
- },
+ 'type' => 'select-pkg_class',
},
{
@@ -1583,14 +1600,14 @@ worry that config_items is freeside-specific and icky.
{
'key' => 'declinetemplate',
'section' => 'billing',
- 'description' => 'Template file for credit card decline emails.',
+ 'description' => 'Template file for credit card and electronic check decline emails.',
'type' => 'textarea',
},
{
'key' => 'emaildecline',
'section' => 'billing',
- 'description' => 'Enable emailing of credit card decline notices.',
+ 'description' => 'Enable emailing of credit card and electronic check decline notices.',
'type' => 'checkbox',
},
@@ -1660,8 +1677,8 @@ worry that config_items is freeside-specific and icky.
{
'key' => 'taxdatadirectdownload',
'section' => 'billing', #well
- 'description' => 'Enable downloading tax data directly from the vendor site',
- 'type' => 'checkbox',
+ 'description' => 'Enable downloading tax data directly from the vendor site. at least three lines: URL, username, and password.j',
+ 'type' => 'textarea',
},
{
@@ -1908,6 +1925,13 @@ worry that config_items is freeside-specific and icky.
},
{
+ 'key' => 'cust_pkg-change_pkgpart-bill_now',
+ 'section' => '',
+ 'description' => "When changing packages, bill the new package immediately. Useful for prepaid situations with RADIUS where an Expiration attribute base don the package must be present at all times.",
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'disable_autoreverse',
'section' => 'BIND',
'description' => 'Disable automatic synchronization of reverse-ARPA entries.',
@@ -2112,6 +2136,13 @@ worry that config_items is freeside-specific and icky.
},
{
+ 'key' => 'address1-search',
+ 'section' => 'UI',
+ 'description' => 'Enable the ability to search the address1 field from customer search.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'address2-search',
'section' => 'UI',
'description' => 'Enable a "Unit" search box which searches the second address field. Useful for multi-tenant applications. See also: cust_main-require_address2',
@@ -2225,6 +2256,14 @@ worry that config_items is freeside-specific and icky.
},
{
+ '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',
+ 'per_agent' => 1,
+ },
+
+ {
'key' => 'cust-fields',
'section' => 'UI',
'description' => 'Which customer fields to display on reports by default',
@@ -2326,14 +2365,28 @@ worry that config_items is freeside-specific and icky.
{
'key' => 'invoice-ship_address',
'section' => 'billing',
- 'description' => 'Enable this switch to include the ship address on the invoice.',
+ 'description' => 'Include the shipping address on invoices.',
'type' => 'checkbox',
},
{
'key' => 'invoice-unitprice',
'section' => 'billing',
- 'description' => 'This switch enables unit pricing on the invoice.',
+ 'description' => 'Enable unit pricing on invoices.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'invoice-smallernotes',
+ 'section' => 'billing',
+ 'description' => 'Display the notes section in a smaller font on invoices.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'invoice-smallerfooter',
+ 'section' => 'billing',
+ 'description' => 'Display footers in a smaller font on invoices.',
'type' => 'checkbox',
},
@@ -2382,17 +2435,18 @@ worry that config_items is freeside-specific and icky.
'type' => 'select',
'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch',
'csv-chase_canada-E-xactBatch', 'BoM', 'PAP',
- 'ach-spiritone',
+ 'paymentech', 'ach-spiritone', 'RBC'
]
},
+ #lists could be auto-generated from pay_batch info
{
'key' => 'batch-fixed_format-CARD',
'section' => 'billing',
'description' => 'Fixed (unchangeable) format for credit card batches.',
'type' => 'select',
'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', 'BoM', 'PAP' ,
- 'csv-chase_canada-E-xactBatch', 'BoM', 'PAP' ]
+ 'csv-chase_canada-E-xactBatch', 'paymentech' ]
},
{
@@ -2401,7 +2455,7 @@ worry that config_items is freeside-specific and icky.
'description' => 'Fixed (unchangeable) format for electronic check batches.',
'type' => 'select',
'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', 'BoM', 'PAP',
- 'ach-spiritone',
+ 'paymentech', 'ach-spiritone', 'RBC'
]
},
@@ -2436,7 +2490,14 @@ worry that config_items is freeside-specific and icky.
{
'key' => 'batchconfig-paymentech',
'section' => 'billing',
- 'description' => 'Configuration for Chase Paymentech batching, four lines: 1. BIN, 2. Terminal ID, 3. Merchant ID, 4. Username',
+ 'description' => 'Configuration for Chase Paymentech batching, five lines: 1. BIN, 2. Terminal ID, 3. Merchant ID, 4. Username, 5. Password (for batch uploads)',
+ 'type' => 'textarea',
+ },
+
+ {
+ 'key' => 'batchconfig-RBC',
+ 'section' => 'billing',
+ 'description' => 'Configuration for Royal Bank of Canada PDS batching, four lines: 1. Client number, 2. Short name, 3. Long name, 4. Transaction code.',
'type' => 'textarea',
},
@@ -2611,14 +2672,14 @@ worry that config_items is freeside-specific and icky.
'key' => 'disable_setup_suspended_pkgs',
'section' => 'billing',
'description' => 'Disables charging of setup fees for suspended packages.',
- 'type' => 'checkbox',
+ 'type' => 'checkbox',
},
{
- 'key' => 'password-generated-allcaps',
- 'section' => 'password',
+ 'key' => 'password-generated-allcaps',
+ 'section' => 'password',
'description' => 'Causes passwords automatically generated to consist entirely of capital letters',
- 'type' => 'checkbox',
+ 'type' => 'checkbox',
},
{
@@ -2887,6 +2948,13 @@ worry that config_items is freeside-specific and icky.
},
{
+ 'key' => 'cust_bill-consolidate_services',
+ 'section' => 'billing',
+ 'description' => 'Consolidate service display into fewer lines on invoices rather than one per service.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'suspend_email_admin',
'section' => '',
'description' => 'Destination admin email address to enable suspension notices',
@@ -2905,6 +2973,7 @@ worry that config_items is freeside-specific and icky.
'section' => '',
'description' => 'HTML for the HEAD section of the self-service interface, typically used for LINK stylesheet tags',
'type' => 'textarea', #htmlarea?
+ 'per_agent' => 1,
},
@@ -2913,6 +2982,7 @@ worry that config_items is freeside-specific and icky.
'section' => '',
'description' => 'HTML header for the self-service interface',
'type' => 'textarea', #htmlarea?
+ 'per_agent' => 1,
},
{
@@ -2920,6 +2990,7 @@ worry that config_items is freeside-specific and icky.
'section' => '',
'description' => 'HTML header for the self-service interface',
'type' => 'textarea', #htmlarea?
+ 'per_agent' => 1,
},
@@ -2928,6 +2999,7 @@ worry that config_items is freeside-specific and icky.
'section' => '',
'description' => 'HTML background color for the self-service interface, for example, #FFFFFF',
'type' => 'text',
+ 'per_agent' => 1,
},
{
@@ -2935,6 +3007,7 @@ worry that config_items is freeside-specific and icky.
'section' => '',
'description' => 'HTML color for self-service interface input boxes, for example, #C0C0C0"',
'type' => 'text',
+ 'per_agent' => 1,
},
{
@@ -3042,7 +3115,7 @@ worry that config_items is freeside-specific and icky.
'key' => 'cust_pkg-show_autosuspend',
'section' => 'UI',
'description' => 'Show package auto-suspend dates. Use with caution for now; can slow down customer view for large insallations.',
- 'type' => 'checkbox',
+ 'type' => 'checkbox',
},
{
@@ -3095,6 +3168,13 @@ worry that config_items is freeside-specific and icky.
},
{
+ 'key' => 'queued-sleep_time',
+ 'section' => '',
+ 'description' => 'Time to sleep between attempts to find new jobs to process in the queue. Defaults to 10. Installations doing real-time CDR processing for prepaid may want to set it lower.',
+ 'type' => 'text',
+ },
+
+ {
'key' => 'cancelled_cust-noevents',
'section' => 'billing',
'description' => "Don't run events for cancelled customers",
@@ -3176,6 +3256,13 @@ worry that config_items is freeside-specific and icky.
},
{
+ 'key' => 'pkg-addon_classnum',
+ 'section' => 'billing',
+ 'description' => 'Enable the ability to restrict additional package orders based on package class.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'cust_main-edit_signupdate',
'section' => 'UI',
'descritpion' => 'Enable manual editing of the signup date.',
@@ -3189,6 +3276,42 @@ worry that config_items is freeside-specific and icky.
'type' => 'checkbox',
},
+ {
+ 'key' => 'cust_bill_pay_pkg-manual',
+ 'section' => 'UI',
+ 'description' => 'Allow manual application of payments to line items.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'cust_credit_bill_pkg-manual',
+ 'section' => 'UI',
+ 'description' => 'Allow manual application of credits to line items.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'breakage-days',
+ 'section' => 'billing',
+ 'description' => 'If set to a number of days, after an account goes that long without activity, recognizes any outstanding payments and credits as "breakage" by creating a breakage charge and invoice.',
+ 'type' => 'text',
+ 'per_agent' => 1,
+ },
+
+ {
+ 'key' => 'breakage-pkg_class',
+ 'section' => 'billing',
+ 'description' => 'Package class to use for breakage reconciliation.',
+ 'type' => 'select-pkg_class',
+ },
+
+ {
+ 'key' => 'disable_cron_billing',
+ 'section' => 'billing',
+ 'description' => 'Disable billing and collection from being run by freeside-daily and freeside-monthly, while still allowing other actions to run, such as notifications and backup.',
+ 'type' => 'checkbox',
+ },
+
{ key => "apacheroot", section => "deprecated", description => "DEPRECATED", type => "text" },
{ key => "apachemachine", section => "deprecated", description => "DEPRECATED", type => "text" },
{ key => "apachemachines", section => "deprecated", description => "DEPRECATED", type => "text" },