X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=8d1f875dbb0880f9b5e6ec314b736067df9bc205;hp=00b0cec3cef4de63bee90266a5b9e4b76b2d76a9;hb=c15077a092c6b194923b72d9baaa50573c1ececb;hpb=bd4cf157ffed8f1191724c1975866c3d21fb30df
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 00b0cec3c..8d1f875db 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);
@@ -312,7 +313,7 @@ sub delete {
my($name, $agentnum) = @_;
if ( my $cv = FS::Record::qsearchs('conf', {name => $name, agentnum => $agentnum}) ) {
- warn "[FS::Conf] DELETE $name\n";
+ warn "[FS::Conf] DELETE $name\n" if $DEBUG;
my $oldAutoCommit = $FS::UID::AutoCommit;
local $FS::UID::AutoCommit = 0;
@@ -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.',
@@ -674,6 +689,13 @@ my %payment_gateway_options = (
'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 +758,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',
@@ -1238,7 +1267,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 +1347,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 +1808,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 +1836,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',
},
{
@@ -2055,6 +2087,14 @@ and customer address. Include units.',
'description' => 'Template to use for welcome messages when a svc_acct record is created.',
%msg_template_options,
},
+
+ {
+ 'key' => 'svc_acct_welcome_exclude',
+ 'section' => 'notification',
+ 'description' => 'A list of svc_acct services for which no welcome email is to be sent.',
+ 'type' => 'select-part_svc',
+ 'multiple' => 1,
+ },
{
'key' => 'welcome_email',
@@ -2201,9 +2241,16 @@ and customer address. Include units.',
},
{
+ 'key' => 'dump-localdest',
+ 'section' => '',
+ 'description' => 'Destination for local database dumps (full path)',
+ 'type' => 'text',
+ },
+
+ {
'key' => 'dump-scpdest',
'section' => '',
- 'description' => 'destination for scp database dumps: user@host:/path',
+ 'description' => 'Destination for scp database dumps: user@host:/path',
'type' => 'text',
},
@@ -2643,6 +2690,14 @@ and customer address. Include units.',
},
{
+ 'key' => 'company_phonenum',
+ 'section' => 'notification',
+ 'description' => 'Your company phone number',
+ 'type' => 'text',
+ 'per_agent' => 1,
+ },
+
+ {
'key' => 'echeck-void',
'section' => 'deprecated',
'description' => 'DEPRECATED, now controlled by ACLs. Used to enable local-only voiding of echeck payments in addition to refunds against the payment gateway',
@@ -2823,7 +2878,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',
},
@@ -2863,6 +2918,13 @@ and customer address. Include units.',
},
{
+ '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.',
@@ -2958,6 +3020,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,
},
{
@@ -3451,6 +3514,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.',
@@ -3800,6 +3870,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',
@@ -3934,12 +4011,19 @@ and customer address. Include units.',
{
'key' => 'cdr-taqua-da_rewrite',
- 'section' => '',
+ 'section' => 'telephony',
'description' => 'For the Taqua CDR format, a comma-separated list of directory assistance 800 numbers. Any CDRs with these numbers as "BilledNumber" will be rewritten to the "CallingPartyNumber" (and CallType "12") on import.',
'type' => 'text',
},
{
+ 'key' => 'cdr-taqua-accountcode_rewrite',
+ 'section' => 'telephony',
+ 'description' => 'For the Taqua CDR format, pull accountcodes from secondary CDRs with matching sessionNumber.',
+ 'type' => 'checkbox',
+ },
+
+ {
'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.',
@@ -4225,12 +4309,26 @@ and customer address. Include units.',
},
{
- 'key' => 'qual-alt-address-format',
+ 'key' => 'qual-alt_address_format',
'section' => 'UI',
- 'description' => 'Enable the alternate address format (location type, number, and kind) on qualifications',
+ 'description' => 'Enable the alternate address format (location type, number, and kind) for qualifications.',
'type' => 'checkbox',
},
-
+
+ {
+ 'key' => 'prospect_main-alt_address_format',
+ 'section' => 'UI',
+ 'description' => 'Enable the alternate address format (location type, number, and kind) for prospects. Recommended if qual-alt_address_format is set and the main use of propects is for qualifications.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'prospect_main-location_required',
+ 'section' => 'UI',
+ 'description' => 'Require an address for prospects. Recommended if the main use of propects is for qualifications.',
+ 'type' => 'checkbox',
+ },
+
{
'key' => 'note-classes',
'section' => 'UI',
@@ -4267,7 +4365,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',
},
@@ -4328,6 +4426,53 @@ 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-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" },