X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=5bad0563656ccda2e90cdf17dd52353b505e0dd8;hb=b5c4237a34aef94976bc343c8d9e138664fc3984;hp=7844ff0fd15c6d349dc73b678c4dfbb231663302;hpb=6ac8854b766c9216584867ad15e1e31fb9da759e;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 7844ff0fd..5bad05636 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -655,6 +655,13 @@ my %payment_gateway_options = (
},
{
+ 'key' => 'credits-auto-apply-disable',
+ 'section' => 'billing',
+ 'description' => 'Disable the "Auto-Apply to invoices" UI option for new credits',
+ 'type' => 'checkbox',
+ },
+
+ {
'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.',
@@ -1318,6 +1325,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',
@@ -4379,6 +4394,14 @@ and customer address. Include units.',
'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" },