From c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 31 Jan 2006 04:26:54 +0000
Subject: move header() to include(/elements/header.html) so it can be changed
 in one place, thanks to Scott Edwards

---
 httemplate/misc/process/cust_main-import.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/misc/process/cust_main-import.cgi')

diff --git a/httemplate/misc/process/cust_main-import.cgi b/httemplate/misc/process/cust_main-import.cgi
index 9e1adce54..2348ef680 100644
--- a/httemplate/misc/process/cust_main-import.cgi
+++ b/httemplate/misc/process/cust_main-import.cgi
@@ -25,6 +25,6 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= header('Import sucessful') %> <%
+    <%= include("/elements/header.html",'Import sucessful') %> <%
   }
 %>
-- 
cgit v1.2.1


From b9f9a5dc444a66ca138073a0e5229d85569e51b4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 25 Mar 2006 02:23:26 +0000
Subject: successfully correct the spelling of sucessful

---
 httemplate/misc/process/cust_main-import.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/misc/process/cust_main-import.cgi')

diff --git a/httemplate/misc/process/cust_main-import.cgi b/httemplate/misc/process/cust_main-import.cgi
index 2348ef680..371929a5e 100644
--- a/httemplate/misc/process/cust_main-import.cgi
+++ b/httemplate/misc/process/cust_main-import.cgi
@@ -25,6 +25,6 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= include("/elements/header.html",'Import sucessful') %> <%
+    <%= include("/elements/header.html",'Import successful') %> <%
   }
 %>
-- 
cgit v1.2.1


From 04cbf1d986eabf7fdcc22ff95b95da17e5f4bf63 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Aug 2006 14:20:51 +0000
Subject: add a new, extended CSV import format

---
 httemplate/misc/process/cust_main-import.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'httemplate/misc/process/cust_main-import.cgi')

diff --git a/httemplate/misc/process/cust_main-import.cgi b/httemplate/misc/process/cust_main-import.cgi
index 371929a5e..aff6b39ef 100644
--- a/httemplate/misc/process/cust_main-import.cgi
+++ b/httemplate/misc/process/cust_main-import.cgi
@@ -10,8 +10,9 @@
         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                          )],
+        #'fields'    => [qw( cust_pkg.setup dayphone first last address1 address2
+        #                   city state zip comments                          )],
+        'format'   => scalar($cgi->param('format')),
       } )
     : 'No file';
 
-- 
cgit v1.2.1


From 3ce7691203a7737406bf2d4442f7fd84b81f847e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Aug 2006 22:25:39 +0000
Subject: Will things ever be the same again? It's the final masonize

---
 httemplate/misc/process/cust_main-import.cgi | 60 +++++++++++++++-------------
 1 file changed, 32 insertions(+), 28 deletions(-)

(limited to 'httemplate/misc/process/cust_main-import.cgi')

diff --git a/httemplate/misc/process/cust_main-import.cgi b/httemplate/misc/process/cust_main-import.cgi
index aff6b39ef..a5ede99a1 100644
--- a/httemplate/misc/process/cust_main-import.cgi
+++ b/httemplate/misc/process/cust_main-import.cgi
@@ -1,31 +1,35 @@
-<%
+%
+%
+%  my $fh = $cgi->upload('csvfile');
+%  #warn $cgi;
+%  #warn $fh;
+%
+%  my $error = defined($fh)
+%    ? FS::cust_main::batch_import( {
+%        filehandle => $fh,
+%        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                          )],
+%        'format'   => scalar($cgi->param('format')),
+%      } )
+%    : 'No file';
+%
+%  if ( $error ) {
+%    
 
-  my $fh = $cgi->upload('csvfile');
-  #warn $cgi;
-  #warn $fh;
-
-  my $error = defined($fh)
-    ? FS::cust_main::batch_import( {
-        filehandle => $fh,
-        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                          )],
-        'format'   => scalar($cgi->param('format')),
-      } )
-    : 'No file';
-
-  if ( $error ) {
-    %>
     <!-- mason kludge -->
-    <%
-    eidiot($error);
-#    $cgi->param('error', $error);
-#    print $cgi->redirect( "${p}cust_main-import.cgi
-  } else {
-    %>
+%
+%    eidiot($error);
+%#    $cgi->param('error', $error);
+%#    print $cgi->redirect( "${p}cust_main-import.cgi
+%  } else {
+%    
+
     <!-- mason kludge -->
-    <%= include("/elements/header.html",'Import successful') %> <%
-  }
-%>
+    <% include("/elements/header.html",'Import successful') %> 
+%
+%  }
+%
+
-- 
cgit v1.2.1