X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=fda199e00bfe05cf0819b01e0f7c5092500ecc86;hb=9d4be18318e5f4baaaa7fd5f995bc307a8dc7f2b;hp=c936082665de4c6e4fb79a636a414f9468f4dba1;hpb=1add633372bdca3cc7163c2ce48363fed3984437;p=freeside.git diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index c93608266..fda199e00 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -1038,16 +1038,6 @@ my $validate_email = sub { $_[0] =~ 'per_locale' => 1, }, - { - 'key' => 'deletecredits', - #not actually deprecated yet - #'section' => 'deprecated', - #'description' => 'DEPRECATED, now controlled by ACLs. Used to enable deletion of unclosed credits. Be very careful! Only delete credits that were data-entry errors, not adjustments. Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.', - 'section' => '', - 'description' => 'One or more comma-separated email addresses to be notified when a credit is deleted.', - 'type' => [qw( checkbox text )], - }, - { 'key' => 'deleterefunds', 'section' => 'billing', @@ -1547,7 +1537,7 @@ and customer address. Include units.', 'type' => 'select', 'per_agent' => 1, 'select_enum' => [ - '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 5', 'Net 9', 'Net 10', 'Net 14', + '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 5', 'Net 7', 'Net 9', 'Net 10', 'Net 14', 'Net 15', 'Net 18', 'Net 20', 'Net 21', 'Net 25', 'Net 30', 'Net 45', 'Net 60', 'Net 90' ], }, @@ -1672,13 +1662,6 @@ and customer address. Include units.', 'per_agent' => 1, }, - { - 'key' => 'payment_receipt_email', - 'section' => 'deprecated', - 'description' => 'Template file for payment receipts. Payment receipts are sent to the customer email invoice destination(s) when a payment is received.', - 'type' => [qw( checkbox textarea )], - }, - { 'key' => 'payment_receipt-trigger', 'section' => 'notification', @@ -1691,6 +1674,13 @@ and customer address. Include units.', 'per_agent' => 1, }, + { + 'key' => 'refund_receipt_msgnum', + 'section' => 'notification', + 'description' => 'Template to use for manual refund receipts.', + %msg_template_options, + }, + { 'key' => 'trigger_export_insert_on_payment', 'section' => 'billing', @@ -1762,7 +1752,7 @@ and customer address. Include units.', { 'key' => 'passwordmax', 'section' => 'password', - 'description' => 'Maximum password length (default 8) (don\'t set this over 12 if you need to import or export crypt() passwords)', + 'description' => 'Maximum password length (default 12) (don\'t set this over 12 if you need to import or export crypt() passwords)', 'type' => 'text', }, @@ -2364,13 +2354,6 @@ and customer address. Include units.', %msg_template_options, }, - { - 'key' => 'declinetemplate', - 'section' => 'deprecated', - 'description' => 'Template file for credit card and electronic check decline emails.', - 'type' => 'textarea', - }, - { 'key' => 'emaildecline', 'section' => 'notification', @@ -2394,20 +2377,6 @@ and customer address. Include units.', %msg_template_options, }, - { - 'key' => 'cancelmessage', - 'section' => 'deprecated', - 'description' => 'Template file for cancellation emails.', - 'type' => 'textarea', - }, - - { - 'key' => 'cancelsubject', - 'section' => 'deprecated', - 'description' => 'Subject line for cancellation emails.', - 'type' => 'text', - }, - { 'key' => 'emailcancel', 'section' => 'notification', @@ -2531,39 +2500,6 @@ and customer address. Include units.', 'multiple' => 1, }, - { - 'key' => 'welcome_email', - 'section' => 'deprecated', - 'description' => 'Template file for welcome email. Welcome emails are sent to the customer email invoice destination(s) each time a svc_acct record is created.', - 'type' => 'textarea', - 'per_agent' => 1, - }, - - { - 'key' => 'welcome_email-from', - 'section' => 'deprecated', - 'description' => 'From: address header for welcome email', - 'type' => 'text', - 'per_agent' => 1, - }, - - { - 'key' => 'welcome_email-subject', - 'section' => 'deprecated', - 'description' => 'Subject: header for welcome email', - 'type' => 'text', - 'per_agent' => 1, - }, - - { - 'key' => 'welcome_email-mimetype', - 'section' => 'deprecated', - 'description' => 'MIME type for welcome email', - 'type' => 'select', - 'select_enum' => [ 'text/plain', 'text/html' ], - 'per_agent' => 1, - }, - { 'key' => 'welcome_letter', 'section' => '', @@ -2571,47 +2507,11 @@ and customer address. Include units.', 'type' => 'textarea', }, -# { -# 'key' => 'warning_msgnum', -# 'section' => 'notification', -# 'description' => 'Template to use for warning messages, sent to the customer email invoice destination(s) when a svc_acct record has its usage drop below a threshold.', -# %msg_template_options, -# }, - { - 'key' => 'warning_email', + 'key' => 'threshold_warning_msgnum', 'section' => 'notification', - 'description' => 'Template file for warning email. Warning emails are sent to the customer email invoice destination(s) each time a svc_acct record has its usage drop below a threshold or 0. See the Text::Template documentation for details on the template substitution language. The following variables are available
$username
$password
$first
$last
$pkg
$column
$amount
$threshold
$packages
allowing $packages->[0]
thru $packages->[n]
$package
the first package, same as $packages->[0]
$recurdates
allowing $recurdates->[0]
thru $recurdates->[n]
$recurdate
the first recurdate, same as $recurdate->[0]
$first
$last
$payby
$expdate
most likely only confuse
- 'type' => 'textarea',
- },
-
{
'key' => 'logo.png',
'section' => 'UI', #'invoicing' ?
@@ -4130,6 +4045,13 @@ and customer address. Include units.',
'type' => 'checkbox',
},
+# {
+# 'key' => 'password-no_reuse',
+# 'section' => 'password',
+# 'description' => 'Minimum number of password changes before a password can be reused. By default, passwords can be reused without restriction.',
+# 'type' => 'text',
+# },
+#
{
'key' => 'datavolume-forcemegabytes',
'section' => 'UI',
@@ -4254,9 +4176,10 @@ and customer address. Include units.',
reason_type_options('R'),
},
+ # was only used to negate invoices during signup when card was declined, now we just void
{
'key' => 'signup_credit_type',
- 'section' => 'billing', #self-service?
+ 'section' => 'deprecated', #self-service?
'description' => 'The group to use for new, automatically generated credit reasons resulting from signup and self-service declines.',
reason_type_options('R'),
},
@@ -4300,7 +4223,7 @@ and customer address. Include units.',
{
'key' => 'disable_previous_balance',
'section' => 'invoicing',
- 'description' => 'Disable inclusion of previous balance, payment, and credit lines on invoices.',
+ 'description' => 'Show new charges only; do not list previous invoices, payments, or credits on the invoice.',
'type' => 'checkbox',
'per_agent' => 1,
},
@@ -4359,7 +4282,6 @@ and customer address. Include units.',
'section' => 'invoicing',
'description' => 'Instead of showing payments (and credits) applied to the invoice, show those received since the previous invoice date.',
'type' => 'checkbox',
- 'uscensus' => 'U.S. Census Bureau',
},
{
@@ -4392,6 +4314,7 @@ and customer address. Include units.',
'description' => 'Method for standardizing customer addresses.',
'type' => 'select',
'select_hash' => [ '' => '',
+ 'uscensus' => 'U.S. Census Bureau',
'usps' => 'U.S. Postal Service',
'tomtom' => 'TomTom',
'melissa' => 'Melissa WebSmart',
@@ -4647,13 +4570,6 @@ and customer address. Include units.',
'type' => 'text',
},
- {
- 'key' => 'email_report-subject',
- 'section' => '',
- 'description' => 'Subject for reports emailed by freeside-fetch. Defaults to "Freeside report".',
- 'type' => 'text',
- },
-
{
'key' => 'selfservice-head',
'section' => 'self-service',
@@ -5248,6 +5164,13 @@ and customer address. Include units.',
],
},
+ {
+ 'key' => 'tax-round_per_line_item',
+ 'section' => 'billing',
+ 'description' => 'Calculate tax and round to the nearest cent for each line item, rather than for the whole invoice.',
+ 'type' => 'checkbox',
+ },
+
{
'key' => 'cust_main-default_view',
'section' => 'UI',
@@ -5613,13 +5536,6 @@ and customer address. Include units.',
'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',
@@ -5762,6 +5678,13 @@ and customer address. Include units.',
'type' => 'checkbox',
},
+ {
+ 'key' => 'selfservice-announcement',
+ 'section' => 'self-service',
+ 'description' => 'HTML announcement to display to all authenticated users on account overview page',
+ 'type' => 'textarea',
+ },
+
{
'key' => 'logout-timeout',
'section' => 'UI',
@@ -5780,13 +5703,6 @@ and customer address. Include units.',
],
},
- {
- 'key' => 'agent-email_day',
- 'section' => '',
- 'description' => 'On this day of each month, agents with master customer records containing email addresses will be emailed a list of their customers and balances.',
- 'type' => 'text',
- },
-
{
'key' => 'report-cust_pay-select_time',
'section' => 'UI',
@@ -5922,6 +5838,15 @@ and customer address. Include units.',
'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',
+ #},
+
);
1;