[freeside-commits] freeside/httemplate/misc/process cust_main-import.cgi, 1.5.2.2, 1.5.2.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/misc/process
In directory wavetail.420.am:/tmp/cvs-serv960/httemplate/misc/process

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	cust_main-import.cgi 
Log Message:
import customer from Excel file too

Index: cust_main-import.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/process/cust_main-import.cgi,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- cust_main-import.cgi	13 Jan 2008 21:14:31 -0000	1.5.2.2
+++ cust_main-import.cgi	14 Aug 2008 01:58:43 -0000	1.5.2.3
@@ -9,20 +9,34 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Import');
 
-my $fh = $cgi->upload('csvfile');
-#warn $cgi;
-#warn $fh;
+my $fh = $cgi->upload('file');
+my $error = '';
+if ( defined($fh) ) {
 
-my $error = defined($fh)
-  ? FS::cust_main::batch_import( {
+  my $type;
+  if ( $cgi->param('file') =~ /\.(\w+)$/i ) {
+    $type = lc($1);
+  } else {
+    #or error out???
+    warn "can't parse file type from filename ". $cgi->param('file').
+         '; defaulting to CSV';
+    $type = 'csv';
+  }
+
+  $error =
+    FS::cust_main::batch_import( {
       filehandle => $fh,
+      type       => $type,
       agentnum   => scalar($cgi->param('agentnum')),
       refnum     => scalar($cgi->param('refnum')),
       pkgpart    => scalar($cgi->param('pkgpart')),
       #'fields'    => [qw( cust_pkg.setup dayphone first last address1 address2
-      #                   city state zip comments                          )],
+      #                    city state zip comments                          )],
       'format'   => scalar($cgi->param('format')),
-    } )
-  : 'No file';
+    } );
+
+} else {
+  $error = 'No file';
+}
 
 </%init>