[freeside-commits] branch master updated. 03b8791b0253e3fd66a6eae75ff54bdd7b51db9d

[Ivan]

The branch, master has been updated
       via  03b8791b0253e3fd66a6eae75ff54bdd7b51db9d (commit)
      from  f88c4a7668591d51e6e923938721010fd0f2fa59 (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 03b8791b0253e3fd66a6eae75ff54bdd7b51db9d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 22 12:08:44 2012 -0700

    add "National ID, plus account and phone services" import format, RT#18946

diff --git a/FS/FS/cust_main/Import.pm b/FS/FS/cust_main/Import.pm
index ee14cba..19c0d52 100644
--- a/FS/FS/cust_main/Import.pm
+++ b/FS/FS/cust_main/Import.pm
@@ -210,8 +210,23 @@ sub batch_import {
                   cust_pkg.pkgpart cust_pkg.bill
                   svc_acct.username svc_acct._password 
                 );
-   push @fields, map "svc_phone.$_", qw(countrycode phonenum sip_password pin);
-   push @fields, map "svc_hardware.$_", qw(typenum ip_addr hw_addr serial);
+    push @fields, map "svc_phone.$_", qw(countrycode phonenum sip_password pin);
+    push @fields, map "svc_hardware.$_", qw(typenum ip_addr hw_addr serial);
+
+    $payby = 'BILL';
+  } elsif ( $format eq 'national_id-acct_phone') {
+    @fields = qw( agent_custid refnum
+                  last first company address1 address2 city state zip 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
+                  cust_pkg.pkgpart cust_pkg.bill
+                  svc_acct.username svc_acct._password 
+                );
+    push @fields, map "svc_phone.$_", qw(countrycode phonenum sip_password pin);
 
     $payby = 'BILL';
   } else {
diff --git a/httemplate/misc/cust_main-import.cgi b/httemplate/misc/cust_main-import.cgi
index 74f9b4c..a5f1d11 100644
--- a/httemplate/misc/cust_main-import.cgi
+++ b/httemplate/misc/cust_main-import.cgi
@@ -36,6 +36,7 @@ Import a file containing customer records.
         <OPTION VALUE="svc_external">External service
         <OPTION VALUE="svc_external_svc_phone">External service and phone service
         <OPTION VALUE="birthdates-acct_phone_hardware">Birthdates and account, phone and hardware services
+        <OPTION VALUE="national_id-acct_phone">National ID, plus account and phone services
       </SELECT>
     </TD>
   </TR>
@@ -110,6 +111,9 @@ 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>
+<BR><BR>
+
 <%$req%> Required fields
 <BR><BR>
 

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

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