X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fcust_pkg-import.html;h=8784dbbe159fe88ec6f34b34be6573947f099516;hp=94e7dd926459ef19cc367df1a6791302bb6cbb1e;hb=5f9f20112eeb53f578900e9e2d43e1e15a6fd96d;hpb=a172aa2d549f2c62978fa1f6b6851a68ae0f2a4e

diff --git a/httemplate/misc/cust_pkg-import.html b/httemplate/misc/cust_pkg-import.html
index 94e7dd926..8784dbbe1 100644
--- a/httemplate/misc/cust_pkg-import.html
+++ b/httemplate/misc/cust_pkg-import.html
@@ -1,6 +1,6 @@
-<% include("/elements/header.html",'Batch Package Import') %>
+<& /elements/header.html, 'Customer package import' &>
 
-Import a file containing package records.
+Import a file containing customer packages.
 <BR><BR>
 
 <& /elements/form-file_upload.html,
@@ -8,19 +8,18 @@ Import a file containing package records.
      'action'    => 'process/cust_pkg-import.html',
      'num_files' => 1,
      'fields'    => [ 'agentnum', 'pkgbatch', 'format' ],
-     'message'   => 'Package import successful',
+     'message'   => 'Customer package import successful',
      'url'       => $p."search/cust_pkg.cgi?pkgbatch=$pkgbatch",
      'onsubmit'  => "document.PackageImportForm.submitButton.disabled=true;"
 &>
 
 <% &ntable("#cccccc", 2) %>
 
-  <% include( '/elements/tr-select-agent.html',
-                 #'curr_value' => '', #$agentnum,
-                 'label'       => "<B>Agent</B>",
-                 'empty_label' => 'Select agent',
-             )
-  %>
+  <& /elements/tr-select-agent.html,
+       #'curr_value' => '', #$agentnum,
+       'label'       => "<B>Agent</B>",
+       'empty_label' => 'Select agent',
+  &>
 
   <INPUT TYPE="hidden" NAME="pkgbatch" VALUE="<% $pkgbatch %>"%>
 
@@ -30,12 +29,19 @@ Import a file containing package records.
       <SELECT NAME="format">
         <OPTION VALUE="default" SELECTED>Default
         <OPTION VALUE="default-agent_custid">Default with agent_custid
+        <OPTION VALUE="default-locationnum">Default with existing location
+        <OPTION VALUE="all_dates">All dates
+        <OPTION VALUE="all_dates-agent_custid">All dates with agent_custid
+        <OPTION VALUE="all_dates-locationnum">All dates with existing location
         <OPTION VALUE="svc_acct">Account service
         <OPTION VALUE="svc_acct-agent_custid">Account service with agent_custid
+        <OPTION VALUE="svc_acct-locationnum">Account service with existing location
         <OPTION VALUE="svc_phone">Phone service
         <OPTION VALUE="svc_phone-agent_custid">Phone service with agent_custid
+        <OPTION VALUE="svc_phone-locationnum">Phone service with existing location
         <OPTION VALUE="svc_external">External service
         <OPTION VALUE="svc_external-agent_custid">External service with agent_custid
+        <OPTION VALUE="svc_external-locationnum">External service with existing location
         <OPTION VALUE="location">Location
         <OPTION VALUE="location-agent_custid">Location with agent_custid
         <OPTION VALUE="location-agent_custid-agent_pkgid">Location with agent_custid and agent_pkgid
@@ -43,11 +49,10 @@ Import a file containing package records.
     </TD>
   </TR>
 
-  <% include( '/elements/file-upload.html',
-                'field' => 'file',
-                'label' => 'Filename',
-            )
-  %>
+  <& /elements/file-upload.html,
+       'field' => 'file',
+       'label' => 'Filename',
+  &>
 
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
@@ -73,24 +78,45 @@ Uploaded files can be CSV (comma-separated value) files or Excel spreadsheets.
 <b>Default with agent_custid</b> format has the following field order: <i>agent_custid<%$req%>, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire</i>
 <BR><BR>
 
+<b>Default with existing location</b> format has the following field order: <i>custnum<%$req%>, locationnum, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire</i>
+<BR><BR>
+
+<b>All dates</b> format has the following field order: <i>custnum<%$req%>, pkgpart<%$req%>, discountnum, order_date, start_date, setup, bill, last_bill, susp, adjourn, resume, cancel, expire, contract_end, dundate</i>
+<BR><BR>
+
+<b>All dates with agent_custid</b> format has the following field order: <i>agent_custid<%$req%>, pkgpart<%$req%>, discountnum, order_date, start_date, setup, bill, last_bill, susp, adjourn, resume, cancel, expire, contract_end, dundate</i>
+<BR><BR>
+
+<b>All dates with existing location</b> format has the following field order: <i>custnum<%$req%>, locationnum, pkgpart<%$req%>, discountnum, order_date, start_date, setup, bill, last_bill, susp, adjourn, resume, cancel, expire, contract_end, dundate</i>
+<BR><BR>
+
 <b>Account service</b> format has the following field order: <i>custnum<%$req%>, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, username, _password, domsvc</i>
 <BR><BR>
 
 <b>Account service with agent_custid</b> format has the following field order: <i>agent_custid<%$req%>, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, username, _password, domsvc</i>
 <BR><BR>
 
+<b>Account service with existing location</b> format has the following field order: <i>custnum<%$req%>, locationnum, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, username, _password, domsvc</i>
+<BR><BR>
+
 <b>Phone sevice</b> format has the following field order: <i>custnum<%$req%>, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, countrycode, phonenum, sip_password, pin</i>
 <BR><BR>
 
 <b>Phone service with agent_custid</b> format has the following field order: <i>agent_custid<%$req%>, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, countrycode, phonenum, sip_password, pin</i>
 <BR><BR>
 
+<b>Phone sevice with existing location</b> format has the following field order: <i>custnum<%$req%>, locationnum, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, countrycode, phonenum, sip_password, pin</i>
+<BR><BR>
+
 <b>External sevice</b> format has the following field order: <i>custnum<%$req%>, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, id, title</i>
 <BR><BR>
 
 <b>External service with agent_custid</b> format has the following field order: <i>agent_custid<%$req%>, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, id, title</i>
 <BR><BR>
 
+<b>External sevice with existing location</b> format has the following field order: <i>custnum<%$req%>, locationnum, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, id, title</i>
+<BR><BR>
+
 <b>Location</b> format has the following field order: <i>custnum<%$req%>,
 pkgpart<%$req%>, discountnum,
 start_date, setup, bill, last_bill, susp, adjourn, cancel, expire,
@@ -155,6 +181,8 @@ Field information:
 
   <li><i>title</i>: External service identifier, text
 
+  <li><i>locationnum</i>: Existing location (cust_location.locationnum)
+
   <li><i>address1</i>: Service address, number and street, text
 
   <li><i>address2</i>: Service address, suite/unit/building identifier, text
@@ -171,7 +199,7 @@ Field information:
 
 <BR>
 
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
 
 <%once>