projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 76992 - Added 3 new import formats that combine Location and Phone Service
[freeside.git]
/
FS
/
FS
/
cust_pkg
/
Import.pm
diff --git
a/FS/FS/cust_pkg/Import.pm
b/FS/FS/cust_pkg/Import.pm
index
26f62f2
..
d3d4e8a
100644
(file)
--- 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;
}
$opt->{'fields'} = \@fields;