X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=cbfde50038bd502f37bd827fc3fe41acae58a028;hp=663add39d6c771f420812621385df4adcd47a8ca;hb=da86d5a8af2f915a340a74f6c97772451a1e23ef;hpb=5cae209e7a123e2fb4da3eb720b54a0b83368977
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 663add39d..cbfde5003 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -655,11 +655,25 @@ my %payment_gateway_options = (
},
{
+ '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.',
+ 'type' => 'text',
+ },
+
+ {
'key' => 'discount-show-always',
'section' => 'billing',
'description' => 'Generate a line item on an invoice even when a package is discounted 100%',
'type' => 'checkbox',
},
+
+ {
+ 'key' => 'invoice-barcode',
+ 'section' => 'billing',
+ 'description' => 'Display a barcode on HTML and PDF invoices',
+ 'type' => 'checkbox',
+ },
{
'key' => 'encryption',
@@ -796,6 +810,17 @@ my %payment_gateway_options = (
},
{
+ 'key' => 'date_format_long',
+ 'section' => 'UI',
+ 'description' => 'Verbose format for displaying dates',
+ 'type' => 'select',
+ 'select_hash' => [
+ '%b %o, %Y' => 'Mon DDth, YYYY',
+ '%e %b %Y' => 'DD Mon YYYY',
+ ],
+ },
+
+ {
'key' => 'deletecustomers',
'section' => 'UI',
'description' => 'Enable customer deletions. Be very careful! Deleting a customer will remove all traces that the customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customers\' packages if they cancel service.',
@@ -1213,7 +1238,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 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 10', 'Net 15', 'Net 20', 'Net 21', 'Net 30', 'Net 45', 'Net 60', 'Net 90' ],
},
{
@@ -1245,6 +1270,13 @@ and customer address. Include units.',
},
{
+ 'key' => 'phone_usage_class_summary',
+ 'section' => 'invoicing',
+ 'description' => 'Summarize usage per DID by usage class and display all CDRs together regardless of usage class. Only valid when svc_phone_sections is enabled.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'svc_phone_sections',
'section' => 'invoicing',
'description' => 'Create a section for each svc_phone when enabled. Only valid when invoice_sections is enabled.',
@@ -1889,6 +1921,13 @@ and customer address. Include units.',
},
{
+ 'key' => 'signup_server-third_party_as_card',
+ 'section' => 'self-service',
+ 'description' => 'Allow customer payment type to be set to CARD even when using third-party credit card billing.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'selfservice-xmlrpc',
'section' => 'self-service',
'description' => 'Run a standalone self-service XML-RPC server on the backend (on port 8080).',
@@ -2531,6 +2570,13 @@ and customer address. Include units.',
},
{
+ 'key' => 'ticket_system-requestor',
+ 'section' => '',
+ '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' => '',
'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.',
@@ -2818,28 +2864,28 @@ and customer address. Include units.',
{
'key' => 'voip-cust_cdr_spools',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Enable the per-customer option for individual CDR spools.',
'type' => 'checkbox',
},
{
'key' => 'voip-cust_cdr_squelch',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Enable the per-customer option for not printing CDR on invoices.',
'type' => 'checkbox',
},
{
'key' => 'voip-cdr_email',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Include the call details on emailed invoices (and HTML invoices viewed in the backend), even if the customer is configured for not printing them on the invoices.',
'type' => 'checkbox',
},
{
'key' => 'voip-cust_email_csv_cdr',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Enable the per-customer option for including CDR information as a CSV attachment on emailed invoices.',
'type' => 'checkbox',
},
@@ -2972,7 +3018,7 @@ 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'
+ 'paymentech', 'ach-spiritone', 'RBC', 'td_eft1464'
]
},
@@ -3021,7 +3067,7 @@ and customer address. Include units.',
{
'key' => 'batchconfig-td_eft1464',
'section' => 'billing',
- 'description' => 'Configuration for TD Bank EFT1464 batching, five lines: 1. Originator ID, 2. Datacenter Code, 3. Short name, 4. Long name, 5. Returned payment branch number, 6. Returned payment account, 7. Transaction code.',
+ 'description' => 'Configuration for TD Bank EFT1464 batching, seven lines: 1. Originator ID, 2. Datacenter Code, 3. Short name, 4. Long name, 5. Returned payment branch number, 6. Returned payment account, 7. Transaction code.',
'type' => 'textarea',
},
@@ -3361,6 +3407,7 @@ and customer address. Include units.',
'type' => 'select',
'select_hash' => [
'' => 'Numeric only',
+ '\d{7}' => 'Numeric only, exactly 7 digits',
'ww?d+' => 'Numeric with one or two letter prefix',
],
},
@@ -3404,6 +3451,13 @@ and customer address. Include units.',
},
{
+ 'key' => 'previous_balance-show_credit',
+ 'section' => 'invoicing',
+ 'description' => 'Show the customer\'s credit balance on invoices when applicable.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'balance_due_below_line',
'section' => 'invoicing',
'description' => 'Place the balance due message below a line. Only meaningful when when invoice_sections is false.',
@@ -3794,35 +3848,35 @@ and customer address. Include units.',
{
'key' => 'svc_phone-radius-default_password',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Default password when exporting svc_phone records to RADIUS',
'type' => 'text',
},
{
'key' => 'svc_phone-allow_alpha_phonenum',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Allow letters in phone numbers.',
'type' => 'checkbox',
},
{
'key' => 'svc_phone-domain',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Track an optional domain association with each phone service.',
'type' => 'checkbox',
},
{
'key' => 'svc_phone-phone_name-max_length',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Maximum length of the phone service "Name" field (svc_phone.phone_name). Sometimes useful to limit this (to 15?) when exporting as Caller ID data.',
'type' => 'text',
},
{
'key' => 'svc_phone-lnp',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Enables Number Portability features for svc_phone',
'type' => 'checkbox',
},
@@ -3836,7 +3890,7 @@ and customer address. Include units.',
{
'key' => 'cdr-charged_party-field',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Set the charged_party field of CDRs to this field.',
'type' => 'select-sub',
'options_sub' => sub { my $fields = FS::cdr->table_info->{'fields'};
@@ -3852,14 +3906,14 @@ and customer address. Include units.',
#probably deprecate in favor of cdr-charged_party-field above
{
'key' => 'cdr-charged_party-accountcode',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Set the charged_party field of CDRs to the accountcode.',
'type' => 'checkbox',
},
{
'key' => 'cdr-charged_party-accountcode-trim_leading_0s',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'When setting the charged_party field of CDRs to the accountcode, trim any leading zeros.',
'type' => 'checkbox',
},
@@ -3880,7 +3934,7 @@ and customer address. Include units.',
{
'key' => 'cdr-charged_party_rewrite',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Do charged party rewriting in the freeside-cdrrewrited daemon; useful if CDRs are being dropped off directly in the database and require special charged_party processing such as cdr-charged_party-accountcode or cdr-charged_party-truncate*.',
'type' => 'checkbox',
},
@@ -3901,7 +3955,7 @@ and customer address. Include units.',
{
'key' => 'cdr-asterisk_forward_rewrite',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'Enable special processing for CDRs representing forwarded calls: For CDRs that have a dcontext that starts with "Local/" but does not match dst, set charged_party to dst, parse a new dst from dstchannel, and set amaflags to "2" ("BILL"/"BILLING").',
'type' => 'checkbox',
},
@@ -4226,7 +4280,7 @@ and customer address. Include units.',
{
'key' => 'opensips_gwlist',
- 'section' => 'opensips',
+ 'section' => 'telephony',
'description' => 'For svc_phone OpenSIPS dr_rules export, gwlist column value, per-agent',
'type' => 'text',
'per_agent' => 1,
@@ -4235,7 +4289,7 @@ and customer address. Include units.',
{
'key' => 'opensips_description',
- 'section' => 'opensips',
+ 'section' => 'telephony',
'description' => 'For svc_phone OpenSIPS dr_rules export, description column value, per-agent',
'type' => 'text',
'per_agent' => 1,
@@ -4244,13 +4298,43 @@ and customer address. Include units.',
{
'key' => 'opensips_route',
- 'section' => 'opensips',
+ 'section' => 'telephony',
'description' => 'For svc_phone OpenSIPS dr_rules export, routeid column value, per-agent',
'type' => 'text',
'per_agent' => 1,
'agentonly' => 1,
},
+ {
+ 'key' => 'cust_bill-no_recipients-error',
+ 'section' => 'invoicing',
+ 'description' => 'For customers with no invoice recipients, throw a job queue error rather than the default behavior of emailing the invoice to the invoice_from address.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ '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?
+ 'type' => 'select',
+ 'select_enum' => [ 'Classic', 'Recurring' ],
+ },
+
+ {
+ 'key' => 'username-pound',
+ 'section' => 'username',
+ 'description' => 'Allow the pound character (#) in usernames.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'ie-compatibility_mode',
+ 'section' => 'UI',
+ 'description' => "Compatibility mode META tag for Internet Explorer, used on the customer view page. Not necessary in normal operation unless custom content (notes, cust_main-custom_link) is included on customer view that is incompatibile with newer IE verisons.",
+ 'type' => 'select',
+ 'select_enum' => [ '', '7', 'EmulateIE7', '8', 'EmulateIE8' ],
+ },
+
{ key => "apacheroot", section => "deprecated", description => "DEPRECATED", type => "text" },
{ key => "apachemachine", section => "deprecated", description => "DEPRECATED", type => "text" },
{ key => "apachemachines", section => "deprecated", description => "DEPRECATED", type => "text" },