From: ivan <ivan>
Date: Tue, 7 Oct 2008 23:57:43 +0000 (+0000)
Subject: put each CDR web import into a batch
X-Git-Tag: root_of_webpay_support~329
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;ds=sidebyside;h=9d74cea56767d887c7b0a26ec337feb1ff05b96a;p=freeside.git

put each CDR web import into a batch
---

diff --git a/httemplate/misc/cdr-import.html b/httemplate/misc/cdr-import.html
index b46607869..62e38b29b 100644
--- a/httemplate/misc/cdr-import.html
+++ b/httemplate/misc/cdr-import.html
@@ -11,6 +11,8 @@ CDR Format:
 
 Filename: <INPUT TYPE="file" NAME="csvfile"><BR><BR>
 
+<INPUT TYPE="hidden" NAME="cdrbatch" VALUE="<% $cdrbatch %>"%>
+
 <INPUT TYPE="submit" VALUE="Upload">
 </FORM>
 
@@ -23,4 +25,6 @@ die "access denied"
 
 tie my %formats, 'Tie::IxHash', FS::cdr->import_formats;
 
+my $cdrbatch = time2str('webimport-%Y/%m/%d-%T'. "-$$-". rand() * 2**32, time);
+
 </%init>
diff --git a/httemplate/misc/process/cdr-import.html b/httemplate/misc/process/cdr-import.html
index 4848fa325..7c4bf2b59 100644
--- a/httemplate/misc/process/cdr-import.html
+++ b/httemplate/misc/process/cdr-import.html
@@ -15,7 +15,8 @@ my $fh = $cgi->upload('csvfile');
 my $error = defined($fh)
   ? FS::cdr::batch_import( {
       'filehandle' => $fh,
-      'format'     => $cgi->param('format'),
+      'format'     => scalar($cgi->param('format')),
+      'cdrbatch'   => scalar($cgi->param('cdrbatch')),
     } )
   : 'No file';