X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2FConf.pm;h=26dbbcd2309f593c295a33854a9a0201bcb4386b;hb=1cfc3ea3efb8c75388ad344ea9481f6f8df072b9;hp=4e1736be3d511661fb90741dc6fec199e2a3964f;hpb=49c58715c06a5150805fd3019a72dc1bc6361514;p=freeside.git diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 4e1736be3..26dbbcd23 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', @@ -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', @@ -2364,13 +2347,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 +2370,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 +2493,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 +2500,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', - 'type' => 'textarea', - }, - - { - 'key' => 'warning_email-from', - 'section' => 'notification', - 'description' => 'From: address header for warning email', - 'type' => 'text', - }, - - { - 'key' => 'warning_email-cc', - 'section' => 'notification', - 'description' => 'Additional recipient(s) (comma separated) for warning email when remaining usage reaches zero.', - 'type' => 'text', - }, - - { - 'key' => 'warning_email-subject', - 'section' => 'notification', - 'description' => 'Subject: header for warning email', - 'type' => 'text', - }, - - { - 'key' => 'warning_email-mimetype', - 'section' => 'notification', - 'description' => 'MIME type for warning email', - 'type' => 'select', - 'select_enum' => [ 'text/plain', 'text/html' ], + '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. Extra substitutions available: $column, $amount, $threshold', + %msg_template_options, }, { @@ -2619,7 +2512,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) ], }, { @@ -2710,14 +2603,6 @@ and customer address. Include units.', 'type' => 'text', }, - { - 'key' => 'dump-email_to', - 'section' => '', - 'description' => "Optional email address to send success/failure message for database dumps.", - 'type' => 'text', - 'validate' => $validate_email, - }, - { 'key' => 'credit_card-recurring_billing_flag', 'section' => 'billing', @@ -3778,11 +3663,12 @@ and customer address. Include units.', 'select_enum' => [ 'approve', 'decline' ], }, + # replaces batch-errors_to (sent email on error) { - 'key' => 'batch-errors_to', + 'key' => 'batch-errors_not_fatal', 'section' => 'billing', - 'description' => 'Email errors when processing batches to this address. If unspecified, batch processing will stop immediately on error.', - 'type' => 'text', + 'description' => 'If checked, when importing batches from a gateway, item errors will be recorded in the system log without aborting processing. If unchecked, batch processing will fail on error.', + 'type' => 'checkbox', }, #lists could be auto-generated from pay_batch info @@ -3855,6 +3741,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', @@ -4074,14 +3967,6 @@ and customer address. Include units.', %msg_template_options, }, - { - 'key' => 'impending_recur_template', - 'section' => 'deprecated', - 'description' => 'Template file for alerts about looming first time recurrant billing. See the Text::Template documentation for details on the template substitition language. Also see packages with a flat price plan The following variables are available', -#
  • $payby
  • $expdate most likely only confuse - 'type' => 'textarea', - }, - { 'key' => 'logo.png', 'section' => 'UI', #'invoicing' ? @@ -4640,13 +4525,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', @@ -5773,13 +5651,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', @@ -5915,6 +5786,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;