[freeside-commits] branch FREESIDE_3_BRANCH updated. 77269df6caa07bb5ba380ce7816dee49045a9a14

Christopher Burger burgerc at 420.am
Wed Aug 16 10:10:39 PDT 2017


The branch, FREESIDE_3_BRANCH has been updated
       via  77269df6caa07bb5ba380ce7816dee49045a9a14 (commit)
       via  8984b31987390ea2ff2dcc83fdcf7340b0531daf (commit)
      from  09ae8565ecf6d252ab770e5efacd4c305103a34a (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 77269df6caa07bb5ba380ce7816dee49045a9a14
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon Aug 7 17:47:50 2017 -0400

    RT# 76992 - removed some development code

diff --git a/FS/FS/cust_pkg/Import.pm b/FS/FS/cust_pkg/Import.pm
index d3d4e8a..616d39a 100644
--- a/FS/FS/cust_pkg/Import.pm
+++ b/FS/FS/cust_pkg/Import.pm
@@ -286,9 +286,6 @@ sub batch_import {
     };
   }
 
-  #probably can delete below - moved to line 292
-  #my $formatfields = _formatfields();
-
   my @formats = split /-/, $format;
   foreach my $f (@formats){
 

commit 8984b31987390ea2ff2dcc83fdcf7340b0531daf
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon Aug 7 16:21:09 2017 -0400

    RT# 76992 - Added 3 new import formats that combine Location and Phone Service

diff --git a/FS/FS/cust_pkg/Import.pm b/FS/FS/cust_pkg/Import.pm
index 26f62f2..d3d4e8a 100644
--- a/FS/FS/cust_pkg/Import.pm
+++ b/FS/FS/cust_pkg/Import.pm
@@ -286,17 +286,23 @@ sub batch_import {
     };
   }
 
-  my $formatfields = _formatfields();
+  #probably can delete below - moved to line 292
+  #my $formatfields = _formatfields();
 
-  die "unknown format $format" unless $formatfields->{$format};
+  my @formats = split /-/, $format;
+  foreach my $f (@formats){
 
-  foreach my $field ( @{ $formatfields->{$format} } ) {
+    my $formatfields = _formatfields();
+    die "unknown format $format" unless $formatfields->{$f};
 
-    push @fields, sub {
-      my( $self, $value, $conf, $param ) = @_;
-      $param->{"$format.$field"} = $value;
-    };
+    foreach my $field ( @{ $formatfields->{$f} } ) {
 
+      push @fields, sub {
+        my( $self, $value, $conf, $param ) = @_;
+        $param->{"$f.$field"} = $value;
+      };
+
+    }
   }
 
   $opt->{'fields'} = \@fields;
diff --git a/httemplate/misc/cust_pkg-import.html b/httemplate/misc/cust_pkg-import.html
index 2ed3c48..ac25e93 100644
--- a/httemplate/misc/cust_pkg-import.html
+++ b/httemplate/misc/cust_pkg-import.html
@@ -48,6 +48,9 @@ Import a file containing customer packages.
         <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
+        <OPTION VALUE="location-svc_phone">Location with phone service
+        <OPTION VALUE="location-svc_phone-agent_custid">Location with phone service and agent_custid
+        <OPTION VALUE="location-svc_phone-agent_custid-agent_pkgid">Location with phone service and agent_custid and agent_pkgid
       </SELECT>
     </TD>
   </TR>
@@ -150,6 +153,27 @@ address1<%$req%>, address2, city<%$req%>, state<%$req%>, zip<%$req%>, country<%$
 </i>
 <BR><BR>
 
+<b>Location with phone service</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%>, countrycode, phonenum, sip_password, pin
+</i>
+<BR><BR>
+
+<b>Location with phone service and 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%>, countrycode, phonenum, sip_password, pin
+</i>
+<BR><BR>
+
+<b>Location with phone service and 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%>, countrycode, phonenum, sip_password, pin
+</i>
+<BR><BR>
+
 <%$req%> Required fields
 <BR><BR>
 

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

Summary of changes:
 FS/FS/cust_pkg/Import.pm             |   17 ++++++++++-------
 httemplate/misc/cust_pkg-import.html |   24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)




More information about the freeside-commits mailing list