X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2FConf.pm;h=1d4a85a57c7d0ba775616612d6c3bb8a6998be3a;hb=917ff4fd80bac4f492d30ab251d626095f4dd939;hp=f3e2447775ca1d66680d06539da070b0e48b468b;hpb=c6ef5a3a043c4fafa2f8d21028609f1b9b70eb47;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index f3e244777..1d4a85a57 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -705,6 +705,11 @@ sub reason_type_options {
}
}
+my $validate_email = sub { $_[0] =~
+ /^[^@]+\@[[:alnum:]-]+(\.[[:alnum:]-]+)+$/
+ ? '' : 'Invalid email address';
+ };
+
#Billing (81 items)
#Invoicing (50 items)
#UI (69 items)
@@ -1196,10 +1201,7 @@ sub reason_type_options {
'description' => 'Return address on email invoices (address only, see invoice_from_name)',
'type' => 'text',
'per_agent' => 1,
- 'validate' => sub { $_[0] =~
- /^[^@]+\@[[:alnum:]-]+(\.[[:alnum:]-]+)+$/
- ? '' : 'Invalid email address';
- }
+ 'validate' => $validate_email,
},
{
@@ -1306,7 +1308,7 @@ sub reason_type_options {
},
{
- 'key' => 'invoicehtmlwatermark',
+ 'key' => 'invoice_htmlwatermark',
'section' => 'invoicing',
'description' => 'Watermark for HTML invoices. Appears in a semitransparent positioned DIV overlaid on the main invoice container.',
'type' => 'textarea',
@@ -1502,7 +1504,7 @@ and customer address. Include units.',
},
{
- 'key' => 'invoicelatexwatermark',
+ 'key' => 'invoice_latexwatermark',
'section' => 'invoicing',
'description' => 'Watermark for LaTeX invoices. See "texdoc background" for information on what this can contain. The content itself should be enclosed in braces, optionally followed by a comma and any formatting options.',
'type' => 'textarea',
@@ -2655,13 +2657,6 @@ and customer address. Include units.',
},
{
- 'key' => 'payment_history_msgnum',
- 'section' => 'notification',
- 'description' => 'Template to use for sending payment history to customer',
- %msg_template_options,
- },
-
- {
'key' => 'payby',
'section' => 'billing',
'description' => 'Available payment types.',
@@ -2765,6 +2760,14 @@ and customer address. Include units.',
},
{
+ 'key' => 'dump-email_to',
+ 'section' => '',
+ 'description' => "Optional email address to send success/failure message for database dumps.",
+ 'type' => 'text',
+ '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.',
@@ -3380,14 +3383,6 @@ and customer address. Include units.',
},
{
- 'key' => 'city_not_required',
- 'section' => 'required',
- 'description' => 'Turn off requirement for a City to be entered for billing & shipping addresses',
- 'type' => 'checkbox',
- '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',
@@ -3980,6 +3975,13 @@ and customer address. Include units.',
},
{
+ 'key' => 'batchconfig-nacha-origin_name',
+ 'section' => 'billing',
+ 'description' => 'Configuration for NACHA batching, Origin name (defaults to company name, but sometimes bank name is needed instead.)',
+ 'type' => 'text',
+ },
+
+ {
'key' => 'batch-manual_approval',
'section' => 'billing',
'description' => 'Allow manual batch closure, which will approve all payments that do not yet have a status. This is not advised unless needed for specific payment processors that provide a report of rejected rather than approved payments.',
@@ -4522,6 +4524,13 @@ and customer address. Include units.',
},
{
+ 'key' => 'cust_main-no_city_in_address',
+ 'section' => 'UI',
+ 'description' => 'Turn off City for billing & shipping addresses',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'census_year',
'section' => 'UI',
'description' => 'The year to use in census tract lookups. NOTE: you need to select 2012 or 2013 for Year 2010 Census tract codes. A selection of 2011 provides Year 2000 Census tract codes. Use the freeside-censustract-update tool if exisitng customers need to be changed.',
@@ -5823,6 +5832,13 @@ and customer address. Include units.',
},
{
+ 'key' => 'selfservice-enable_payment_without_balance',
+ 'section' => 'self-service',
+ 'description' => 'Allow selfservice customers to make payments even if balance is zero or below (resulting in an unapplied payment and negative balance.)',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'logout-timeout',
'section' => 'UI',
'description' => 'If set, automatically log users out of the backoffice after this many minutes.',