X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=43e7aaa3de092d22049b8adc5a8f85e432b3ff5b;hb=a2253aacd9b6c142236fb800f1c74b04510000f9;hp=610b3a954853e73fe28a739e37f538266b6bfd13;hpb=db4098505d7936ff06df667e72626a4e04eba6d5;p=freeside.git diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 610b3a954..43e7aaa3d 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -312,7 +312,7 @@ sub delete { my($name, $agentnum) = @_; if ( my $cv = FS::Record::qsearchs('conf', {name => $name, agentnum => $agentnum}) ) { - warn "[FS::Conf] DELETE $name\n"; + warn "[FS::Conf] DELETE $name\n" if $DEBUG; my $oldAutoCommit = $FS::UID::AutoCommit; local $FS::UID::AutoCommit = 0; @@ -655,11 +655,25 @@ my %payment_gateway_options = ( }, { + 'key' => 'credit-card-surcharge-percentage', + 'section' => 'billing', + 'description' => 'Add a credit card surcharge to invoices, as a % of the invoice total. WARNING: this is usually prohibited by merchant account / other agreements and/or law, but is currently lawful in AU and UK.', + 'type' => 'text', + }, + + { 'key' => 'discount-show-always', 'section' => 'billing', 'description' => 'Generate a line item on an invoice even when a package is discounted 100%', 'type' => 'checkbox', }, + + { + 'key' => 'invoice-barcode', + 'section' => 'billing', + 'description' => 'Display a barcode on HTML and PDF invoices', + 'type' => 'checkbox', + }, { 'key' => 'encryption', @@ -1224,7 +1238,7 @@ and customer address. Include units.', 'section' => 'invoicing', 'description' => 'Optional default invoice term, used to calculate a due date printed on invoices.', 'type' => 'select', - 'select_enum' => [ '', 'Payable upon receipt', 'Net 0', 'Net 10', 'Net 15', 'Net 20', 'Net 21', 'Net 30', 'Net 45', 'Net 60', 'Net 90' ], + 'select_enum' => [ '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 10', 'Net 15', 'Net 20', 'Net 21', 'Net 30', 'Net 45', 'Net 60', 'Net 90' ], }, { @@ -1256,6 +1270,13 @@ and customer address. Include units.', }, { + 'key' => 'phone_usage_class_summary', + 'section' => 'invoicing', + 'description' => 'Summarize usage per DID by usage class and display all CDRs together regardless of usage class. Only valid when svc_phone_sections is enabled.', + 'type' => 'checkbox', + }, + + { 'key' => 'svc_phone_sections', 'section' => 'invoicing', 'description' => 'Create a section for each svc_phone when enabled. Only valid when invoice_sections is enabled.', @@ -1297,6 +1318,14 @@ and customer address. Include units.', 'description' => 'Template to use for payment receipts.', %msg_template_options, }, + + { + 'key' => 'payment_receipt_from', + 'section' => 'notification', + 'description' => 'From: address for payment receipts, if not specified in the template.', + 'type' => 'text', + 'per_agent' => 1, + }, { 'key' => 'payment_receipt_email', @@ -1900,6 +1929,13 @@ and customer address. Include units.', }, { + 'key' => 'signup_server-third_party_as_card', + 'section' => 'self-service', + 'description' => 'Allow customer payment type to be set to CARD even when using third-party credit card billing.', + 'type' => 'checkbox', + }, + + { 'key' => 'selfservice-xmlrpc', 'section' => 'self-service', 'description' => 'Run a standalone self-service XML-RPC server on the backend (on port 8080).', @@ -2027,6 +2063,14 @@ and customer address. Include units.', 'description' => 'Template to use for welcome messages when a svc_acct record is created.', %msg_template_options, }, + + { + 'key' => 'svc_acct_welcome_exclude', + 'section' => 'notification', + 'description' => 'A list of svc_acct services for which no welcome email is to be sent.', + 'type' => 'select-part_svc', + 'multiple' => 1, + }, { 'key' => 'welcome_email', @@ -2173,9 +2217,16 @@ and customer address. Include units.', }, { + 'key' => 'dump-localdest', + 'section' => '', + 'description' => 'Destination for local database dumps (full path)', + 'type' => 'text', + }, + + { 'key' => 'dump-scpdest', 'section' => '', - 'description' => 'destination for scp database dumps: user@host:/path', + 'description' => 'Destination for scp database dumps: user@host:/path', 'type' => 'text', }, @@ -2542,6 +2593,13 @@ and customer address. Include units.', }, { + 'key' => 'ticket_system-requestor', + 'section' => '', + 'description' => 'Email address to use as the requestor for new tickets. If blank, the customer\'s invoicing address(es) will be used.', + 'type' => 'text', + }, + + { 'key' => 'ticket_system-priority_reverse', 'section' => '', 'description' => 'Enable this to consider lower numbered priorities more important. A bad habit we picked up somewhere. You probably want to avoid it and use the default.', @@ -2608,6 +2666,14 @@ and customer address. Include units.', }, { + 'key' => 'company_phonenum', + 'section' => 'notification', + 'description' => 'Your company phone number', + 'type' => 'text', + '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', @@ -2983,7 +3049,7 @@ and customer address. Include units.', 'description' => 'Fixed (unchangeable) format for electronic check batches.', 'type' => 'select', 'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', 'BoM', 'PAP', - 'paymentech', 'ach-spiritone', 'RBC' + 'paymentech', 'ach-spiritone', 'RBC', 'td_eft1464' ] }, @@ -3032,7 +3098,7 @@ and customer address. Include units.', { 'key' => 'batchconfig-td_eft1464', 'section' => 'billing', - 'description' => 'Configuration for TD Bank EFT1464 batching, five lines: 1. Originator ID, 2. Datacenter Code, 3. Short name, 4. Long name, 5. Returned payment branch number, 6. Returned payment account, 7. Transaction code.', + 'description' => 'Configuration for TD Bank EFT1464 batching, seven lines: 1. Originator ID, 2. Datacenter Code, 3. Short name, 4. Long name, 5. Returned payment branch number, 6. Returned payment account, 7. Transaction code.', 'type' => 'textarea', }, @@ -3416,6 +3482,13 @@ and customer address. Include units.', }, { + 'key' => 'previous_balance-show_credit', + 'section' => 'invoicing', + 'description' => 'Show the customer\'s credit balance on invoices when applicable.', + 'type' => 'checkbox', + }, + + { 'key' => 'balance_due_below_line', 'section' => 'invoicing', 'description' => 'Place the balance due message below a line. Only meaningful when when invoice_sections is false.', @@ -3899,12 +3972,19 @@ and customer address. Include units.', { 'key' => 'cdr-taqua-da_rewrite', - 'section' => '', + 'section' => 'telephony', 'description' => 'For the Taqua CDR format, a comma-separated list of directory assistance 800 numbers. Any CDRs with these numbers as "BilledNumber" will be rewritten to the "CallingPartyNumber" (and CallType "12") on import.', 'type' => 'text', }, { + 'key' => 'cdr-taqua-accountcode_rewrite', + 'section' => 'telephony', + 'description' => 'For the Taqua CDR format, pull accountcodes from secondary CDRs with matching sessionNumber.', + 'type' => 'checkbox', + }, + + { 'key' => 'cust_pkg-show_autosuspend', 'section' => 'UI', 'description' => 'Show package auto-suspend dates. Use with caution for now; can slow down customer view for large insallations.', @@ -4190,12 +4270,26 @@ and customer address. Include units.', }, { - 'key' => 'qual-alt-address-format', + 'key' => 'qual-alt_address_format', 'section' => 'UI', - 'description' => 'Enable the alternate address format (location type, number, and kind) on qualifications', + 'description' => 'Enable the alternate address format (location type, number, and kind) for qualifications.', 'type' => 'checkbox', }, - + + { + 'key' => 'prospect_main-alt_address_format', + 'section' => 'UI', + 'description' => 'Enable the alternate address format (location type, number, and kind) for prospects. Recommended if qual-alt_address_format is set and the main use of propects is for qualifications.', + 'type' => 'checkbox', + }, + + { + 'key' => 'prospect_main-location_required', + 'section' => 'UI', + 'description' => 'Require an address for prospects. Recommended if the main use of propects is for qualifications.', + 'type' => 'checkbox', + }, + { 'key' => 'note-classes', 'section' => 'UI', @@ -4273,11 +4367,34 @@ and customer address. Include units.', { 'key' => 'cust_main-status_module', 'section' => 'UI', - 'description' => 'Which module to use for customer status display. The "Classic" module (the default) considers accounts with cancelled recurring packages but un-cancelled one-time charges Inactive. The "Recurring" module considers those customers Cancelled.', #other differences? + 'description' => 'Which module to use for customer status display. The "Classic" module (the default) considers accounts with cancelled recurring packages but un-cancelled one-time charges Inactive. The "Recurring" module considers those customers Cancelled. Similarly for customers with suspended recurring packages but one-time charges.', #other differences? 'type' => 'select', 'select_enum' => [ 'Classic', 'Recurring' ], }, + { + 'key' => 'username-pound', + 'section' => 'username', + 'description' => 'Allow the pound character (#) in usernames.', + 'type' => 'checkbox', + }, + + { + 'key' => 'ie-compatibility_mode', + 'section' => 'UI', + 'description' => "Compatibility mode META tag for Internet Explorer, used on the customer view page. Not necessary in normal operation unless custom content (notes, cust_main-custom_link) is included on customer view that is incompatibile with newer IE verisons.", + 'type' => 'select', + 'select_enum' => [ '', '7', 'EmulateIE7', '8', 'EmulateIE8' ], + }, + + { + 'key' => 'disable_payauto_default', + 'section' => 'UI', + 'description' => 'Disable the "Charge future payments to this (card|check) automatically" checkbox from defaulting to checked.', + '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" },