X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fcust_pkg-import.html;h=e0c0c7ff4018d4500e8dc2ee3ce17fa748a4016d;hb=b4aea58e0d04ff1930397e0f96ecdc50748b748b;hp=f86d317b9ccb0987c90ade2fab8b2dad7ec98f4a;hpb=fb4ab1073f0d15d660c6cdc4e07afebf68ef3924;p=freeside.git

diff --git a/httemplate/misc/cust_pkg-import.html b/httemplate/misc/cust_pkg-import.html
index f86d317b9..e0c0c7ff4 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 %>"%>
 
@@ -36,15 +35,17 @@ Import a file containing package records.
         <OPTION VALUE="svc_phone-agent_custid">Phone service with agent_custid
         <OPTION VALUE="svc_external">External service
         <OPTION VALUE="svc_external-agent_custid">External service with agent_custid
+        <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
       </SELECT>
     </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">
@@ -88,6 +89,27 @@ Uploaded files can be CSV (comma-separated value) files or Excel spreadsheets.
 <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>Location</b> format has the following field order: <i>custnum<%$req%>,
+pkgpart<%$req%>, discountnum,
+start_date, setup, bill, last_bill, susp, adjourn, cancel, expire,
+address1<%$req%>, address2, city<%$req%>, state<%$req%>, zip<%$req%>, country<%$req%>
+</i>
+<BR><BR>
+
+<b>Location 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,
+address1<%$req%>, address2, city<%$req%>, state<%$req%>, zip<%$req%>, country<%$req%>
+</i>
+<BR><BR>
+
+<b>Location with agent_custid and agent_pkgid</b> format has the following field order: <i>agent_custid<%$req%>, agent_pkgid,
+pkgpart<%$req%>, discountnum,
+start_date, setup, bill, last_bill, susp, adjourn, cancel, expire,
+address1<%$req%>, address2, city<%$req%>, state<%$req%>, zip<%$req%>, country<%$req%>
+</i>
+<BR><BR>
+
 <%$req%> Required fields
 <BR><BR>
 
@@ -99,6 +121,8 @@ Field information:
 
   <li><i>agent_custid</i>: This specifies an existing customer record by agent_custid.
 
+  <li><i>agent_pkgid</i>: This specifies an existing customer record by agent_custid.
+
   <li><i>pkgpart</i>: Package definition.  Configuration -&gt; Packages -&gt; Package definitions
 
   <li><i>discountnum</i>: Optional discount.  Configuration -&gt; Packages -&gt; Discounts
@@ -129,11 +153,23 @@ Field information:
 
   <li><i>title</i>: External service identifier, text
 
+  <li><i>address1</i>: Service address, number and street, text
+
+  <li><i>address2</i>: Service address, suite/unit/building identifier, text
+
+  <li><i>city</i>: Service address, name of city, text
+
+  <li><i>state</i>: Service address, state/province, abbreviated
+
+  <li><i>zip</i>: Service address, postal code
+
+  <li><i>country</i>: Service address, country, 2-letter code
+
 </ul>
 
 <BR>
 
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
 
 <%once>