projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore expired cards on customer import
[freeside.git]
/
FS
/
FS
/
cust_main
/
Import.pm
diff --git
a/FS/FS/cust_main/Import.pm
b/FS/FS/cust_main/Import.pm
index
f477323
..
e58a044
100644
(file)
--- a/
FS/FS/cust_main/Import.pm
+++ b/
FS/FS/cust_main/Import.pm
@@
-5,8
+5,8
@@
use vars qw( $DEBUG $conf );
use Storable qw(thaw);
use Data::Dumper;
use MIME::Base64;
use Storable qw(thaw);
use Data::Dumper;
use MIME::Base64;
-use Date::Parse;
use File::Slurp qw( slurp );
use File::Slurp qw( slurp );
+use FS::Misc::DateTime qw( parse_datetime );
use FS::UID qw( dbh );
use FS::Record qw( qsearchs );
use FS::cust_main;
use FS::UID qw( dbh );
use FS::Record qw( qsearchs );
use FS::cust_main;
@@
-214,6
+214,10
@@
sub batch_import {
my $oldAutoCommit = $FS::UID::AutoCommit;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
my $oldAutoCommit = $FS::UID::AutoCommit;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
+
+ #implies ignore_expired_card
+ local($FS::cust_main::import) = 1;
+ local($FS::cust_main::import) = 1;
my $line;
my $row = 0;
my $line;
my $row = 0;
@@
-264,13
+268,13
@@
sub batch_import {
if ( $field =~ /^cust_pkg\.(pkgpart|setup|bill|susp|adjourn|expire|cancel)$/ ) {
if ( $field =~ /^cust_pkg\.(pkgpart|setup|bill|susp|adjourn|expire|cancel)$/ ) {
- #$cust_pkg{$1} =
str2
time( shift @$columns );
+ #$cust_pkg{$1} =
parse_date
time( shift @$columns );
if ( $1 eq 'pkgpart' ) {
$cust_pkg{$1} = shift @columns;
} elsif ( $1 eq 'setup' ) {
if ( $1 eq 'pkgpart' ) {
$cust_pkg{$1} = shift @columns;
} elsif ( $1 eq 'setup' ) {
- $billtime =
str2
time(shift @columns);
+ $billtime =
parse_date
time(shift @columns);
} else {
} else {
- $cust_pkg{$1} =
str2
time( shift @columns );
+ $cust_pkg{$1} =
parse_date
time( shift @columns );
}
} elsif ( $field =~ /^svc_acct\.(username|_password)$/ ) {
}
} elsif ( $field =~ /^svc_acct\.(username|_password)$/ ) {
@@
-328,6
+332,12
@@
sub batch_import {
tie my %hash, 'Tie::RefHash'; #this part is important
if ( $cust_pkg{'pkgpart'} ) {
tie my %hash, 'Tie::RefHash'; #this part is important
if ( $cust_pkg{'pkgpart'} ) {
+
+ unless ( $cust_pkg{'pkgpart'} =~ /^\d+$/ ) {
+ $dbh->rollback if $oldAutoCommit;
+ return 'illegal pkgpart: '. $cust_pkg{'pkgpart'};
+ }
+
my $cust_pkg = new FS::cust_pkg ( \%cust_pkg );
my @svc_x = ();
my $cust_pkg = new FS::cust_pkg ( \%cust_pkg );
my @svc_x = ();