X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=1714c575a26b00587735654124bac29c2aae805f;hb=ab5177ddab29e7fca9f64144a0c1ed104ead3ead;hp=1d4a85a57c7d0ba775616612d6c3bb8a6998be3a;hpb=2ead33f915536127cd148d4e2ca474b9c45c634b;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 1d4a85a57..1714c575a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -719,13 +719,6 @@ my $validate_email = sub { $_[0] =~
@config_items = map { new FS::ConfItem $_ } (
- {
- 'key' => 'address',
- 'section' => 'deprecated',
- 'description' => 'This configuration option is no longer used. See invoice_template instead.',
- 'type' => 'text',
- },
-
{
'key' => 'event_log_level',
'section' => 'notification',
@@ -1045,13 +1038,6 @@ my $validate_email = sub { $_[0] =~
'per_locale' => 1,
},
- {
- 'key' => 'deleteinvoices',
- 'section' => 'UI',
- 'description' => 'Enable invoices deletions. Be very careful! Deleting an invoice will remove all traces that the invoice ever existed! Normally, you would void or apply a credit against the invoice instead.',
- 'type' => 'checkbox',
- },
-
{
'key' => 'deletecredits',
#not actually deprecated yet
@@ -1069,20 +1055,6 @@ my $validate_email = sub { $_[0] =~
'type' => 'checkbox',
},
- {
- 'key' => 'unapplypayments',
- 'section' => 'deprecated',
- 'description' => 'DEPRECATED, now controlled by ACLs. Used to enable "unapplication" of unclosed payments.',
- 'type' => 'checkbox',
- },
-
- {
- 'key' => 'unapplycredits',
- 'section' => 'deprecated',
- 'description' => 'DEPRECATED, now controlled by ACLs. Used to enable "unapplication" of unclosed credits.',
- 'type' => 'checkbox',
- },
-
{
'key' => 'dirhash',
'section' => 'shell',
@@ -1669,13 +1641,6 @@ and customer address. Include units.',
'type' => 'checkbox',
},
- {
- 'key' => 'invoice_send_receipts',
- 'section' => 'deprecated',
- 'description' => 'DEPRECATED, this used to send an invoice copy on payments and credits. See the payment_receipt_email and XXXX instead.',
- 'type' => 'checkbox',
- },
-
{
'key' => 'payment_receipt',
'section' => 'notification',
@@ -1873,13 +1838,6 @@ and customer address. Include units.',
# 'description' => 'Directory which contains domain registry information. Each registry is a directory.',
# },
- {
- 'key' => 'report_template',
- 'section' => 'deprecated',
- 'description' => 'Deprecated template file for reports.',
- 'type' => 'textarea',
- },
-
{
'key' => 'maxsearchrecordsperpage',
'section' => 'UI',
@@ -2661,7 +2619,7 @@ and customer address. Include units.',
'section' => 'billing',
'description' => 'Available payment types.',
'type' => 'selectmultiple',
- 'select_enum' => [ qw(CARD DCRD CHEK DCHK CASH WEST MCRD MCHK PPAL) ],
+ 'select_enum' => [ qw(CARD DCRD CHEK DCHK BILL CASH WEST MCRD MCHK PPAL) ],
},
{
@@ -2686,13 +2644,6 @@ and customer address. Include units.',
'type' => 'checkbox',
},
- {
- 'key' => 'paymentforcedtobatch',
- 'section' => 'deprecated',
- 'description' => 'See batch-enable_payby and realtime-disable_payby. Used to (for CHEK): Cause per customer payment entry to be forced to a batch processor rather than performed realtime.',
- 'type' => 'checkbox',
- },
-
{
'key' => 'svc_acct-notes',
'section' => 'deprecated',
@@ -2767,13 +2718,6 @@ and customer address. Include units.',
'validate' => $validate_email,
},
- {
- 'key' => 'users-allow_comp',
- 'section' => 'deprecated',
- 'description' => 'DEPRECATED, enable the Complimentary customer access right instead. Was: Usernames (Freeside users, created with freeside-adduser) which can create complimentary customers, one per line. If no usernames are entered, all users can create complimentary accounts.',
- 'type' => 'textarea',
- },
-
{
'key' => 'credit_card-recurring_billing_flag',
'section' => 'billing',
@@ -3382,27 +3326,6 @@ and customer address. Include units.',
'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',
- 'type' => 'checkbox',
- },
-
- {
- 'key' => 'cc-void',
- 'section' => 'deprecated',
- 'description' => 'DEPRECATED, now controlled by ACLs. Used to enable local-only voiding of credit card payments in addition to refunds against the payment gateway',
- 'type' => 'checkbox',
- },
-
- {
- 'key' => 'unvoid',
- 'section' => 'deprecated',
- 'description' => 'DEPRECATED, now controlled by ACLs. Used to enable unvoiding of voided payments',
- 'type' => 'checkbox',
- },
-
{
'key' => 'address1-search',
'section' => 'UI',
@@ -3432,12 +3355,6 @@ and customer address. Include units.',
'per_agent' => 1,
},
- { 'key' => 'referral_credit',
- 'section' => 'deprecated',
- 'description' => "Used to enable one-time referral credits in the amount of one month referred customer's recurring fee (irregardless of frequency). Replace with a billing event on appropriate packages.",
- 'type' => 'checkbox',
- },
-
{ 'key' => 'selfservice_server-cache_module',
'section' => 'self-service',
'description' => 'Module used to store self-service session information. All modules handle any number of self-service servers. Cache::SharedMemoryCache is appropriate for a single database / single Freeside server. Cache::FileCache is useful for multiple databases on a single server, or when IPC::ShareLite is not available (i.e. FreeBSD).', # _Database stores session information in the database and is appropriate for multiple Freeside servers, but may be slower.',
@@ -3938,6 +3855,13 @@ and customer address. Include units.',
'type' => 'textarea',
},
+ {
+ 'key' => 'batchconfig-RBC-login',
+ 'section' => 'billing',
+ 'description' => 'FTPS login for uploading Royal Bank of Canada batches. Two lines: 1. username, 2. password. If not supplied, batches can still be created but not automatically uploaded.',
+ 'type' => 'textarea',
+ },
+
{
'key' => 'batchconfig-td_eft1464',
'section' => 'billing',
@@ -5998,47 +5922,14 @@ and customer address. Include units.',
'type' => 'text',
},
- { key => "apacheroot", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "apachemachine", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "apachemachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "bindprimary", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "bindsecondaries", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "bsdshellmachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "cyrus", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "cp_app", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "erpcdmachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "icradiusmachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "icradius_mysqldest", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "icradius_mysqlsource", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "icradius_secrets", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "maildisablecatchall", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "mxmachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "nsmachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "arecords", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "cnamerecords", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "nismachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "qmailmachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "radiusmachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "sendmailconfigpath", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "sendmailmachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "sendmailrestart", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "shellmachine", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "shellmachine-useradd", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "shellmachine-userdel", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "shellmachine-usermod", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "shellmachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "radiusprepend", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "textradiusprepend", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "username_policy", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "vpopmailmachines", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "vpopmailrestart", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "safe-part_pkg", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "selfservice_server-quiet", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "signup_server-quiet", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "signup_server-email", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "vonage-username", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "vonage-password", section => "deprecated", description => "DEPRECATED", type => "text" },
- { key => "vonage-fromnumber", section => "deprecated", description => "DEPRECATED", type => "text" },
+ # for internal use only; test databases should declare this option and
+ # everyone else should pretend it doesn't exist
+ #{
+ # 'key' => 'no_random_ids',
+ # 'section' => '',
+ # 'description' => 'Replace random identifiers in UI code with a static string, for repeatable testing. Don\'t use in production.',
+ # 'type' => 'checkbox',
+ #},
);