[freeside-commits] freeside/FS/FS Conf.pm, 1.324.2.15, 1.324.2.16 tax_rate.pm, 1.29.2.1, 1.29.2.2

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv22045/FS/FS

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	Conf.pm tax_rate.pm 
Log Message:
move cch conf into database and add a couple small tools for processing updates more manually

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.324.2.15
retrieving revision 1.324.2.16
diff -u -d -r1.324.2.15 -r1.324.2.16
--- Conf.pm	20 Dec 2009 21:52:09 -0000	1.324.2.15
+++ Conf.pm	21 Dec 2009 14:37:23 -0000	1.324.2.16
@@ -1659,8 +1659,8 @@
   {
     'key'         => 'taxdatadirectdownload',
     'section'     => 'billing',  #well
-    'description' => 'Enable downloading tax data directly from the vendor site',
-    'type'        => 'checkbox',
+    'description' => 'Enable downloading tax data directly from the vendor site. at least three lines: URL, username, and password.j',
+    'type'        => 'textarea',
   },
 
   {

Index: tax_rate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/tax_rate.pm,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -u -d -r1.29.2.1 -r1.29.2.2
--- tax_rate.pm	12 Nov 2009 16:57:55 -0000	1.29.2.1
+++ tax_rate.pm	21 Dec 2009 14:37:23 -0000	1.29.2.2
@@ -1398,11 +1398,14 @@
     eval "use XBase;";
     die $@ if $@;
 
-    my $conffile = '%%%FREESIDE_CONF%%%/cchconf';
-    my $conffh = new IO::File "<$conffile" or die "can't open $conffile: $!\n";
-    my ( $urls, $secret, $states ) =
-      map { /^(.*)$/ or die "bad config line in $conffile: $_\n"; $1 }
-          <$conffh>;
+    my $conf = new FS::Conf;
+    die "direct download of tax data not enabled\n" 
+      unless $conf->exists('taxdatadirectdownload');
+    my ( $urls, $username, $secret, $states ) =
+      $conf->config('taxdatadirectdownload');
+    die "No tax download URL provided.  ".
+        "Did you set the taxdatadirectdownload configuration value?\n"
+      unless $urls;
 
     $dir .= '/cch';