[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 359d3c5ba6969bf5203a6f367f75bca371c64874

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  359d3c5ba6969bf5203a6f367f75bca371c64874 (commit)
      from  fd64501b96f4e149ceb3896cc334b330910afe9a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 359d3c5ba6969bf5203a6f367f75bca371c64874
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Aug 28 02:06:16 2012 -0700

    add slipip to "National ID..." import format, RT#18946

diff --git a/FS/FS/cust_main/Import.pm b/FS/FS/cust_main/Import.pm
index 19c0d52..eadcc1a 100644
--- a/FS/FS/cust_main/Import.pm
+++ b/FS/FS/cust_main/Import.pm
@@ -224,7 +224,7 @@ sub batch_import {
                   payinfo paycvv paydate
                   invoicing_list
                   cust_pkg.pkgpart cust_pkg.bill
-                  svc_acct.username svc_acct._password 
+                  svc_acct.username svc_acct._password svc_acct.slipip
                 );
     push @fields, map "svc_phone.$_", qw(countrycode phonenum sip_password pin);
 
@@ -336,7 +336,7 @@ sub batch_import {
           $cust_pkg{$1} = parse_datetime( shift @columns );
         } 
 
-      } elsif ( $field =~ /^svc_acct\.(username|_password)$/ ) {
+      } elsif ( $field =~ /^svc_acct\.(username|_password|slipip)$/ ) {
 
         $svc_x{$1} = shift @columns;
 
diff --git a/httemplate/misc/cust_main-import.cgi b/httemplate/misc/cust_main-import.cgi
index a5f1d11..d56feac 100644
--- a/httemplate/misc/cust_main-import.cgi
+++ b/httemplate/misc/cust_main-import.cgi
@@ -111,7 +111,7 @@ Uploaded files can be CSV (comma-separated value) files or Excel spreadsheets.
 <b>Birthdates and account, phone and hardware services</b> format has the following field order: <i>agent_custid, refnum<%$req%>, last<%$req%>, first<%$req%>, company, address1<%$req%>, address2, city<%$req%>, state<%$req%>, zip<%$req%>, country, daytime, night, ship_last, ship_first, ship_company, ship_address1, ship_address2, ship_city, ship_state, ship_zip, ship_country, birthdate, spouse_birthdate, payinfo, paycvv, paydate, invoicing_list, pkgpart, next_bill_date, username, _password, countrycode, phonenum, sip_password, pin, typenum, ip_addr, hw_addr, serial</i>
 <BR><BR>
 
-<b>National ID, plus account and phone services</b> format has the following field order: <i>agent_custid, refnum<%$req%>, last<%$req%>, first<%$req%>, company, address1<%$req%>, address2, city<%$req%>, state<%$req%>, zip<%$req%>, country, daytime, night, ship_last, ship_first, ship_company, ship_address1, ship_address2, ship_city, ship_state, ship_zip, ship_country, national_id, payinfo, paycvv, paydate, invoicing_list, pkgpart, next_bill_date, username, _password, countrycode, phonenum, sip_password, pin</i>
+<b>National ID, plus account and phone services</b> format has the following field order: <i>agent_custid, refnum<%$req%>, last<%$req%>, first<%$req%>, company, address1<%$req%>, address2, city<%$req%>, state<%$req%>, zip<%$req%>, country, daytime, night, ship_last, ship_first, ship_company, ship_address1, ship_address2, ship_city, ship_state, ship_zip, ship_country, national_id, payinfo, paycvv, paydate, invoicing_list, pkgpart, next_bill_date, username, _password, slipip, countrycode, phonenum, sip_password, pin</i>
 <BR><BR>
 
 <%$req%> Required fields
@@ -139,6 +139,8 @@ advertising source table.
 
   <li><i>username</i> and <i>_password</i> are required if <i>pkgpart</i> is specified. (Extended and Extended plus company formats)
 
+  <li><i>slipip</i>: IP address
+
   <li><i>id</i>: External service id, integer
 
   <li><i>title</i>: External service identifier, text

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main/Import.pm            |    4 ++--
 httemplate/misc/cust_main-import.cgi |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)