add checkbox to payment_receipt_email config

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

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 594f3b3..41c14ad 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -174,23 +174,15 @@ sub set {
                          };
   $new->value($value);
 
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
   my $error;
   if ($old) {
     $error = $new->replace($old);
-  }else{
+  } else {
     $error = $new->insert;
   }
 
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    die "error setting configuration value: $error \n"
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  die "error setting configuration value: $error \n"
+    if $error;
 
 }
 
@@ -758,7 +750,7 @@ httemplate/docs/config.html
     '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 <a href="http://search.cpan.org/~mjd/Text-Template/lib/Text/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available: <ul><li><code>$date</code> <li><code>$name</code> <li><code>$paynum</code> - Freeside payment number <li><code>$paid</code> - Amount of payment <li><code>$payby</code> - Payment type (Card, Check, Electronic check, etc.) <li><code>$payinfo</code> - Masked credit card number or check number <li><code>$balance</code> - New balance</ul>',
-    'type'        => 'textarea',
+    'type'        => [qw( checkbox textarea )],
   },
 
   {
@@ -1185,7 +1177,14 @@ httemplate/docs/config.html
   {
     'key'         => 'show_ss',
     'section'     => 'UI',
-    'description' => 'Turns on display/collection of SS# in the web interface.',
+    'description' => 'Turns on display/collection of social security numbers in the web interface.  Sometimes required by electronic check (ACH) processors.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'show_stateid',
+    'section'     => 'UI',
+    'description' => "Turns on display/collection of driver's license/state issued id numbers in the web interface.  Sometimes required by electronic check (ACH) processors.",
     'type'        => 'checkbox',
   },
 
@@ -1860,26 +1859,6 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
-  #these should become per-user...
-  {
-    'key'         => 'vonage-username',
-    'section'     => '',
-    'description' => 'Vonage Click2Call username (see <a href="https://secure.click2callu.com/">https://secure.click2callu.com/</a>)',
-    'type'        => 'text',
-  },
-  {
-    'key'         => 'vonage-password',
-    'section'     => '',
-    'description' => 'Vonage Click2Call username (see <a href="https://secure.click2callu.com/">https://secure.click2callu.com/</a>)',
-    'type'        => 'text',
-  },
-  {
-    'key'         => 'vonage-fromnumber',
-    'section'     => '',
-    'description' => 'Vonage Click2Call number (see <a href="https://secure.click2callu.com/">https://secure.click2callu.com/</a>)',
-    'type'        => 'text',
-  },
-
   {
     'key'         => 'echeck-nonus',
     'section'     => 'billing',
@@ -1911,7 +1890,7 @@ httemplate/docs/config.html
   {
     'key'         => 'batch-enable',
     'section'     => 'billing',
-    'description' => 'Enable credit card batching - leave disabled for real-time installations.',
+    'description' => 'Enable credit card and/or ACH batching - leave disabled for real-time installations.',
     'type'        => 'checkbox',
   },
 
@@ -1921,7 +1900,9 @@ httemplate/docs/config.html
     'description' => 'Default format for batches.',
     'type'        => 'select',
     'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch',
-                       'csv-chase_canada-E-xactBatch', 'BoM', 'PAP' ]
+                       'csv-chase_canada-E-xactBatch', 'BoM', 'PAP',
+                       'ach-spiritone',
+                    ]
   },
 
   {
@@ -1938,7 +1919,9 @@ httemplate/docs/config.html
     'section'     => 'billing',
     'description' => 'Fixed (unchangeable) format for electronic check batches.',
     'type'        => 'select',
-    'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', 'BoM', 'PAP' ]
+    'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', 'BoM', 'PAP',
+                       'ach-spiritone',
+                     ]
   },
 
   {
@@ -2084,6 +2067,20 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'disable_setup_suspended_pkgs',
+    'section'     => 'billing',
+    'description' => 'Disables charging of setup fees for suspended packages.',
+    'type'       => 'checkbox',
+  },
+
+  {
+    'key' => 'password-generated-allcaps',
+    'section' => 'password',
+    'description' => 'Causes passwords automatically generated to consist entirely of capital letters',
+    'type' => 'checkbox',
+  },
+
 );
 
 1;