From 4bcc2b89f717df76f1ff8ca90000cbba7592bb89 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 16 Feb 2010 02:19:38 +0000
Subject: refactor cch tax import to remove tons of false laziness and improve
 flexibility; allow reload from local files

---
 httemplate/misc/process/tax-import.cgi |  2 +-
 httemplate/misc/tax-import.cgi         | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'httemplate/misc')

diff --git a/httemplate/misc/process/tax-import.cgi b/httemplate/misc/process/tax-import.cgi
index f800dbd5b..b9e9daad5 100644
--- a/httemplate/misc/process/tax-import.cgi
+++ b/httemplate/misc/process/tax-import.cgi
@@ -4,6 +4,6 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Import');
 
-my $server = new FS::UI::Web::JSRPC 'FS::tax_rate::process_batch_import', $cgi; 
+my $server = new FS::UI::Web::JSRPC 'FS::tax_rate::process_batch_import', $cgi;
 
 </%init>
diff --git a/httemplate/misc/tax-import.cgi b/httemplate/misc/tax-import.cgi
index 5116e5404..91b82b4e5 100644
--- a/httemplate/misc/tax-import.cgi
+++ b/httemplate/misc/tax-import.cgi
@@ -7,7 +7,7 @@ Import a CSV file set containing tax rate records.
               'name'      => 'TaxRateUpload',
               'action'    => 'process/tax-import.cgi', 
               'num_files' => 6,
-              'fields'    => [ 'format', ],
+              'fields'    => [ 'format', 'reload' ],
               'message'   => 'Tax rates imported',
           )
 %>
@@ -18,14 +18,21 @@ Import a CSV file set containing tax rate records.
     <TH ALIGN="right">Format</TH>
     <TD>
       <SELECT NAME="format">
-        <OPTION VALUE="cch-update" SELECTED>CCH update (CSV)
-        <OPTION VALUE="cch">CCH initial import (CSV)
-        <OPTION VALUE="cch-fixed-update">CCH update (fixed length)
-        <OPTION VALUE="cch-fixed">CCH initial import (fixed length)
+        <!-- <OPTION VALUE="cch-update" SELECTED>CCH update (CSV) -->
+        <OPTION VALUE="cch">CCH import (CSV)
+        <!-- <OPTION VALUE="cch-fixed-update">CCH update (fixed length) -->
+        <OPTION VALUE="cch-fixed">CCH import (fixed length)
       </SELECT>
     </TD>
   </TR>
 
+  <TR>
+    <TH ALIGN="right">Replace existing data from this vendor</TH>
+    <TD>
+      <INPUT NAME="reload" TYPE="checkbox" VALUE="1" CHECKED>
+    </TD>
+  </TR>
+
   <% include( '/elements/file-upload.html',
                 'field'    => [ 'geofile',
                                 'codefile',
-- 
cgit v1.2.1