X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2FConf.pm;h=8b49e9c97eb97b72cb2356b96fa17ebc730c5ce6;hb=d830c5362596475cf118d715f707994f9ce69bb6;hp=e18cff693de93bb6e109b201ad336d960c3fab34;hpb=214563932444cf0cd8c5f1824370969a96081fa0;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e18cff693..8b49e9c97 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -548,21 +548,36 @@ worry that config_items is freeside-specific and icky.
"Solo",
);
-@base_items = qw (
- invoice_template
- invoice_latex
- invoice_latexreturnaddress
- invoice_latexfooter
- invoice_latexsmallfooter
- invoice_latexnotes
- invoice_latexcoupon
- invoice_html
- invoice_htmlreturnaddress
- invoice_htmlfooter
- invoice_htmlnotes
- logo.png
- logo.eps
- );
+@base_items = qw(
+invoice_template
+invoice_latex
+invoice_latexreturnaddress
+invoice_latexfooter
+invoice_latexsmallfooter
+invoice_latexnotes
+invoice_latexcoupon
+invoice_html
+invoice_htmlreturnaddress
+invoice_htmlfooter
+invoice_htmlnotes
+logo.png
+logo.eps
+);
+
+my %msg_template_options = (
+ 'type' => 'select-sub',
+ 'options_sub' => sub { require FS::Record;
+ require FS::agent;
+ require FS::msg_template;
+ map { $_->msgnum, $_->msgname }
+ qsearch('msg_template', { disabled => '' });
+ },
+ 'option_sub' => sub { require FS::msg_template;
+ my $msg_template = FS::msg_template->by_key(shift);
+ $msg_template ? $msg_template->msgname : ''
+ },
+);
+
#Billing (81 items)
#Invoicing (50 items)
@@ -571,7 +586,6 @@ worry that config_items is freeside-specific and icky.
#...
#Unclassified (77 items)
-
@config_items = map { new FS::ConfItem $_ } (
{
@@ -583,7 +597,7 @@ worry that config_items is freeside-specific and icky.
{
'key' => 'alert_expiration',
- 'section' => 'billing',
+ 'section' => 'notification',
'description' => 'Enable alerts about billing method expiration.',
'type' => 'checkbox',
'per_agent' => 1,
@@ -591,11 +605,18 @@ worry that config_items is freeside-specific and icky.
{
'key' => 'alerter_template',
- 'section' => 'billing',
- 'description' => 'Template file for billing method expiration alerts. See the billing documentation for details.',
+ 'section' => 'deprecated',
+ 'description' => 'Template file for billing method expiration alerts (i.e. expiring credit cards).',
'type' => 'textarea',
'per_agent' => 1,
},
+
+ {
+ 'key' => 'alerter_msgnum',
+ 'section' => 'notification',
+ 'description' => 'Template to use for credit card expiration alerts.',
+ %msg_template_options,
+ },
{
'key' => 'apacheip',
@@ -1205,16 +1226,23 @@ and customer address. Include units.',
'type' => 'checkbox',
},
+ {
+ 'key' => 'payment_receipt_msgnum',
+ 'section' => 'notification',
+ 'description' => 'Template to use for payment receipts',
+ %msg_template_options,
+ },
+
{
'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:
$date
$name
$paynum
- Freeside payment number $paid
- Amount of payment $payby
- Payment type (Card, Check, Electronic check, etc.) $payinfo
- Masked credit card number or check number $balance
- New balance$pkg
- Package (requires payment_receipt-trigger set to "when payment is applied".)
',
+ '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' => 'billing',
+ 'section' => 'notification',
'description' => 'When payment receipts are triggered. Defaults to when payment is made.',
'type' => 'select',
'select_hash' => [
@@ -1774,42 +1802,56 @@ and customer address. Include units.',
{
'key' => 'declinetemplate',
- 'section' => 'billing',
+ 'section' => 'deprecated',
'description' => 'Template file for credit card decline emails.',
'type' => 'textarea',
},
+ {
+ 'key' => 'decline_msgnum',
+ 'section' => 'notification',
+ 'description' => 'Template to use for credit card and electronic check decline messages.',
+ %msg_template_options,
+ },
+
{
'key' => 'emaildecline',
- 'section' => 'billing',
+ 'section' => 'notification',
'description' => 'Enable emailing of credit card decline notices.',
'type' => 'checkbox',
},
{
'key' => 'emaildecline-exclude',
- 'section' => 'billing',
+ 'section' => 'notification',
'description' => 'List of error messages that should not trigger email decline notices, one per line.',
'type' => 'textarea',
},
{
'key' => 'cancelmessage',
- 'section' => 'billing',
+ 'section' => 'deprecated',
'description' => 'Template file for cancellation emails.',
'type' => 'textarea',
},
+ {
+ 'key' => 'cancel_msgnum',
+ 'section' => 'notification',
+ 'description' => 'Template to use for cancellation emails.',
+ %msg_template_options,
+ },
+
{
'key' => 'cancelsubject',
- 'section' => 'billing',
+ 'section' => 'deprecated',
'description' => 'Subject line for cancellation emails.',
'type' => 'text',
},
{
'key' => 'emailcancel',
- 'section' => 'billing',
+ 'section' => 'notification',
'description' => 'Enable emailing of cancellation notices. Make sure to fill in the cancelmessage and cancelsubject configuration values as well.',
'type' => 'checkbox',
},
@@ -1865,15 +1907,22 @@ and customer address. Include units.',
{
'key' => 'welcome_email',
- 'section' => '',
- '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. See the Text::Template documentation for details on the template substitution language. The following variables are available$username
$password
$first
$last
$pkg
',
+ '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_msgnum',
+ 'section' => 'notification',
+ 'description' => 'Template to use for welcome messages when a svc_acct record is created.',
+ %msg_template_options,
+ },
+
{
'key' => 'welcome_email-from',
- 'section' => '',
+ 'section' => 'deprecated',
'description' => 'From: address header for welcome email',
'type' => 'text',
'per_agent' => 1,
@@ -1881,7 +1930,7 @@ and customer address. Include units.',
{
'key' => 'welcome_email-subject',
- 'section' => '',
+ 'section' => 'deprecated',
'description' => 'Subject: header for welcome email',
'type' => 'text',
'per_agent' => 1,
@@ -1889,7 +1938,7 @@ and customer address. Include units.',
{
'key' => 'welcome_email-mimetype',
- 'section' => '',
+ 'section' => 'deprecated',
'description' => 'MIME type for welcome email',
'type' => 'select',
'select_enum' => [ 'text/plain', 'text/html' ],
@@ -1898,42 +1947,49 @@ and customer address. Include units.',
{
'key' => 'welcome_letter',
- 'section' => '',
+ 'section' => 'deprecated',
'description' => 'Optional LaTex template file for a printed welcome letter. A welcome letter is printed the first time a cust_pkg record is created. See the Text::Template documentation and the billing documentation for details on the template substitution language. A variable exists for each fieldname in the customer record ($first, $last, etc
). The following additional variables are available$payby
- a friendler represenation of the field$payinfo
- the masked payment information$expdate
- the time at which the payment method expires (a UNIX timestamp)$returnaddress
- the invoice return address for this customer\'s agent
',
'type' => 'textarea',
},
{
'key' => 'warning_email',
- 'section' => '',
+ '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
',
'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-from',
- 'section' => '',
+ 'section' => 'notification',
'description' => 'From: address header for warning email',
'type' => 'text',
},
{
'key' => 'warning_email-cc',
- 'section' => '',
+ 'section' => 'notification',
'description' => 'Additional recipient(s) (comma separated) for warning email when remaining usage reaches zero.',
'type' => 'text',
},
{
'key' => 'warning_email-subject',
- 'section' => '',
+ 'section' => 'notification',
'description' => 'Subject: header for warning email',
'type' => 'text',
},
{
'key' => 'warning_email-mimetype',
- 'section' => '',
+ 'section' => 'notification',
'description' => 'MIME type for warning email',
'type' => 'select',
'select_enum' => [ 'text/plain', 'text/html' ],
@@ -1971,7 +2027,7 @@ and customer address. Include units.',
{
'key' => 'radius-password',
- 'section' => '',
+ 'section' => 'notification',
'description' => 'RADIUS attribute for plain-text passwords.',
'type' => 'select',
'select_enum' => [ 'Password', 'User-Password', 'Cleartext-Password' ],
@@ -2237,7 +2293,12 @@ and customer address. Include units.',
}
},
},
-
+ {
+ 'key' => 'ticket_system-force_default_queueid',
+ 'section' => '',
+ 'description' => 'Disallow queue selection when creating new tickets from customer view.',
+ 'type' => 'checkbox',
+ },
{
'key' => 'ticket_system-selfservice_queueid',
'section' => '',
@@ -2900,9 +2961,16 @@ and customer address. Include units.',
'select_enum' => [ '1 hour', '2 hours', '4 hours', '8 hours', '1 day', '1 week', ],
},
+ {
+ 'key' => 'impending_recur_msgnum',
+ 'section' => 'notification',
+ 'description' => 'Template to use for alerts about first-time recurring billing.',
+ %msg_template_options,
+ },
+
{
'key' => 'disable_setup_suspended_pkgs',
- 'section' => 'billing',
+ 'section' => 'deprecated',
'description' => 'Disables charging of setup fees for suspended packages.',
'type' => 'checkbox',
},
@@ -3117,7 +3185,7 @@ and customer address. Include units.',
'section' => 'UI',
'description' => 'The year to use in census tract lookups',
'type' => 'select',
- 'select_enum' => [ qw( 2009 2008 2007 2006 ) ],
+ 'select_enum' => [ qw( 2010 2009 2008 ) ],
},
{
@@ -3382,7 +3450,6 @@ and customer address. Include units.',
'per_agent' => 1,
},
-
{
'key' => 'selfservice-menu_top_image',
'section' => 'self-service',
@@ -3724,6 +3791,20 @@ and customer address. Include units.',
'select_enum' => [ 'misc_info', 'top' ],
},
+ {
+ 'key' => 'cust_main-custom_link',
+ 'section' => 'UI',
+ 'description' => 'URL to use as source for the "Custom" tab in the View Customer page. The custnum will be appended.',
+ 'type' => 'text',
+ },
+
+ {
+ 'key' => 'cust_main-custom_title',
+ 'section' => 'UI',
+ 'description' => 'Title for the "Custom" tab in the View Customer page.',
+ '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" },