From 44a63e5978af2b5b4e00cabbc4b3541df4144305 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 27 Jul 2009 06:17:20 +0000 Subject: [PATCH] add deprecated config options back to Conf.pm to fix "unapplypayments" fails existential comparison errors, RT#2927 --- FS/FS/Conf.pm | 98 +++++++++++++++++++++++++++++++++++++++ httemplate/config/config-view.cgi | 2 + 2 files changed, 100 insertions(+) diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 37f55306a..0fe3ca977 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -715,6 +715,20 @@ worry that config_items is freeside-specific and icky. }, { + '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 nable "unapplication" of unclosed credits.', + 'type' => 'checkbox', + }, + + { 'key' => 'dirhash', 'section' => 'shell', 'description' => 'Optional numeric value to control directory hashing. If positive, hashes directories for the specified number of levels from the front of the username. If negative, hashes directories for the specified number of levels from the end of the username. Some examples: ', @@ -936,6 +950,13 @@ worry that config_items is freeside-specific and icky. }, { + '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_email', 'section' => 'billing', 'description' => 'Template file for payment receipts. Payment receipts are sent to the customer email invoice destination(s) when a payment is received. See the Text::Template documentation for details on the template substitution language. The following variables are available: ', @@ -1024,6 +1045,13 @@ worry that config_items is freeside-specific and icky. # }, { + 'key' => 'report_template', + 'section' => 'deprecated', + 'description' => 'Deprecated template file for reports.', + 'type' => 'textarea', + }, + + { 'key' => 'maxsearchrecordsperpage', 'section' => 'UI', 'description' => 'If set, number of search records to return per page.', @@ -1694,6 +1722,13 @@ worry that config_items is freeside-specific and icky. }, { + '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', 'description' => 'This controls when the system passes the "recurring_billing" flag on credit card transactions. If supported by your processor (and the Business::OnlinePayment processor module), passing the flag indicates this is a recurring transaction and may turn off the CVV requirement. ', @@ -1929,6 +1964,27 @@ worry that config_items is freeside-specific and icky. }, { + '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' => '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', @@ -2939,6 +2995,48 @@ worry that config_items is freeside-specific and icky. '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" }, + { 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" }, + ); 1; diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi index c5ac1a685..9e9e64eb2 100644 --- a/httemplate/config/config-view.cgi +++ b/httemplate/config/config-view.cgi @@ -78,6 +78,8 @@ Click on a configuration value to change it. % foreach my $agent ( @agents ) { % my $agentnum = $agent ? $agent->agentnum : ''; % +% next if $section eq 'deprecated' && ! $conf->exists($i->key, $agentnum); +% % my $label = $i->key; % $label = '['. $agent->agent. "] $label" % if $agent && $cgi->param('showagent'); -- 2.11.0