diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2017-08-07 16:21:09 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2017-08-16 13:18:15 -0400 |
| commit | b086818c8dde80d873a799be644b5b98611f5acb (patch) | |
| tree | 626ae0d9e13946e3e5296b94d310daa241be20ad | |
| parent | 2f455001bfc3c9e82d8147722fd44a4ffea80963 (diff) | |
RT# 76992 - Added 3 new import formats that combine Location and Phone Service
| -rw-r--r-- | FS/FS/cust_pkg/Import.pm | 20 | ||||
| -rw-r--r-- | httemplate/misc/cust_pkg-import.html | 24 |
2 files changed, 37 insertions, 7 deletions
diff --git a/FS/FS/cust_pkg/Import.pm b/FS/FS/cust_pkg/Import.pm index 63a9909..27fced1 100644 --- a/FS/FS/cust_pkg/Import.pm +++ b/FS/FS/cust_pkg/Import.pm @@ -283,17 +283,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> |