ignore problams calling ->overlimit during sqlradius-reset, wtf?! RT#5868

[freeside.git] / FS / FS / Conf.pm

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 9725957..362b63c 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1598,6 +1598,14 @@ worry that config_items is freeside-specific and icky.
     'select_enum' => [ 'Framed-IP-Address', 'Framed-Address' ],
   },
 
+  #http://dev.coova.org/svn/coova-chilli/doc/dictionary.chillispot
+  {
+    'key'         => 'radius-chillispot-max',
+    'section'     => '',
+    'description' => 'Enable ChilliSpot (and CoovaChilli) Max attributes, specifically ChilliSpot-Max-{Input,Output,Total}-{Octets,Gigawords}.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'svc_acct-alldomains',
     'section'     => '',
@@ -1633,7 +1641,7 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'select',
     'select_hash' => [
                        'actual_oncard' => 'Default/classic behavior: set the flag if a customer has actual previous charges on the card.',
-                      'transaction_is_recur' => 'Set the flag if the transaction itself is recurring, irregardless of previous charges on the card.',
+                       'transaction_is_recur' => 'Set the flag if the transaction itself is recurring, irregardless of previous charges on the card.',
                      ],
   },
 
@@ -1946,7 +1954,7 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'svc_acct-usage_threshold',
     'section'     => 'billing',
-    'description' => 'The threshold (expressed as percentage) of acct.seconds or acct.up|down|totalbytes at which a warning message is sent to a service holder.  Typically used in conjunction with prepaid packages and freeside-sqlradius-radacctd.  Defaults to 80.',
+    'description' => 'The threshold (expressed as percentage) of acct.seconds or acct.up|down|totalbytes at which a warning message is sent to a service holder.  Typically used in conjunction with prepaid packages and freeside-sqlradius-radacctd.',
     'type'        => 'text',
   },
 
@@ -2055,16 +2063,23 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'select-sub',
     'options_sub' => sub { require FS::Record;
                            require FS::part_pkg;
-                          map { $_->pkgpart => $_->pkg }
+                           map { $_->pkgpart => $_->pkg }
                                FS::Record::qsearch('part_pkg', { disabled=>'' } );
-                        },
+                         },
     'option_sub'  => sub { require FS::Record;
                            require FS::part_pkg;
-                          my $part_pkg = FS::Record::qsearchs(
-                            'part_pkg', { 'pkgpart'=>shift }
-                          );
+                           my $part_pkg = FS::Record::qsearchs(
+                             'part_pkg', { 'pkgpart'=>shift }
+                           );
                            $part_pkg ? $part_pkg->pkg : '';
-                        },
+                         },
+  },
+
+  {
+    'key'         => 'postal_invoice-recurring_only',
+    'section'     => 'billing',
+    'description' => 'The postal invoice fee is omitted on invoices without recurring charges when this is set',
+    'type'        => 'checkbox',
   },
 
   {
@@ -2293,8 +2308,6 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
-  
-
   {
     'key'         => 'cust_main-require_phone',
     'section'     => '',
@@ -2316,16 +2329,16 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'select-sub',
     'options_sub' => sub { require FS::Record;
                            require FS::reason_type;
-                          map { $_->typenum => $_->type }
+                           map { $_->typenum => $_->type }
                                FS::Record::qsearch('reason_type', { class=>'R' } );
-                        },
+                         },
     'option_sub'  => sub { require FS::Record;
                            require FS::reason_type;
-                          my $reason_type = FS::Record::qsearchs(
-                            'reason_type', { 'typenum' => shift }
-                          );
+                           my $reason_type = FS::Record::qsearchs(
+                             'reason_type', { 'typenum' => shift }
+                           );
                            $reason_type ? $reason_type->type : '';
-                        },
+                         },
   },
 
   {
@@ -2335,16 +2348,16 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'select-sub',
     'options_sub' => sub { require FS::Record;
                            require FS::reason_type;
-                          map { $_->typenum => $_->type }
+                           map { $_->typenum => $_->type }
                                FS::Record::qsearch('reason_type', { class=>'R' } );
-                        },
+                         },
     'option_sub'  => sub { require FS::Record;
                            require FS::reason_type;
-                          my $reason_type = FS::Record::qsearchs(
-                            'reason_type', { 'typenum' => shift }
-                          );
+                           my $reason_type = FS::Record::qsearchs(
+                             'reason_type', { 'typenum' => shift }
+                           );
                            $reason_type ? $reason_type->type : '';
-                        },
+                         },
   },
 
   {
@@ -2354,16 +2367,16 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'select-sub',
     'options_sub' => sub { require FS::Record;
                            require FS::reason_type;
-                          map { $_->typenum => $_->type }
+                           map { $_->typenum => $_->type }
                                FS::Record::qsearch('reason_type', { class=>'R' } );
-                        },
+                         },
     'option_sub'  => sub { require FS::Record;
                            require FS::reason_type;
-                          my $reason_type = FS::Record::qsearchs(
-                            'reason_type', { 'typenum' => shift }
-                          );
+                           my $reason_type = FS::Record::qsearchs(
+                             'reason_type', { 'typenum' => shift }
+                           );
                            $reason_type ? $reason_type->type : '';
-                        },
+                         },
   },
 
   {
@@ -2457,6 +2470,20 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'cancelled_cust-noevents',
+    'section'     => 'billing',
+    'description' => "Don't run events for cancelled customers",
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'svc_broadband-manage_link',
+    'section'     => 'UI',
+    'description' => 'URL for svc_broadband "Manage Device" link.  The following substitutions are available: $ip_addr.',
+    'type'        => 'text',
+  },
+
 );
 
 1;