sub process_batch_import {
my $job = shift;
- #agent_custid isn't a cust_pay field, see hash callback
- my $format = [ qw(custnum agent_custid paid payinfo invnum) ];
my $hashcb = sub {
my %hash = @_;
my $custnum = $hash{'custnum'};
+ my $agentnum = $hash{'agentnum'};
my $agent_custid = $hash{'agent_custid'};
#standardize date
$hash{'_date'} = parse_datetime($hash{'_date'})
if $hash{'_date'} && $hash{'_date'} =~ /\D/;
+ #remove custnum_prefix
+ my $custnum_prefix = $conf->config('cust_main-custnum-display_prefix');
+ my $custnum_length = $conf->config('cust_main-custnum-display_length') || 8;
+ if (
+ $custnum_prefix
+ && $custnum =~ /^$custnum_prefix(0*([1-9]\d*))$/
+ && length($1) == $custnum_length
+ ) {
+ $custnum = $2;
+ }
+ # check agentnum against custnum and
# translate agent_custid into regular custnum
if ($custnum && $agent_custid) {
die "can't specify both custnum and agent_custid\n";
- } elsif ($agent_custid) {
+ } elsif ($agentnum || $agent_custid) {
# here is the agent virtualization
my $extra_sql = ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql;
- my $agentnum = $hash{'agentnum'};
- my %search = (
- 'agent_custid' => $agent_custid,
- 'agentnum' => $agentnum,
- );
+ my %search;
+ $search{'agentnum'} = $agentnum
+ if $agentnum;
+ $search{'agent_custid'} = $agent_custid
+ if $agent_custid;
+ $search{'custnum'} = $custnum
+ if $custnum;
my $cust_main = qsearchs({
'table' => 'cust_main',
'hashref' => \%search,
'extra_sql' => $extra_sql,
});
- die "can't find customer with agent_custid $agent_custid\n"
+ die "can't find customer with" .
+ ($agentnum ? " agentnum $agentnum" : '') .
+ ($custnum ? " custnum $custnum" : '') .
+ ($agent_custid ? " agent_custid $agent_custid" : '') . "\n"
unless $cust_main;
+ die "mismatched customer number\n"
+ if $custnum && ($custnum ne $cust_main->custnum);
$custnum = $cust_main->custnum;
}
- #remove custnum_prefix
- my $custnum_prefix = $conf->config('cust_main-custnum-display_prefix');
- my $custnum_length = $conf->config('cust_main-custnum-display_length') || 8;
- if (
- $custnum_prefix
- && $custnum =~ /^$custnum_prefix(0*([1-9]\d*))$/
- && length($1) == $custnum_length
- ) {
- $custnum = $2;
- }
$hash{'custnum'} = $custnum;
delete($hash{'agent_custid'});
return %hash;
my $opt = { 'table' => 'cust_pay',
'params' => [ '_date', 'agentnum', 'payby', 'paybatch' ],
- 'formats' => {
- 'simple-csv' => $format,
- 'simple-xls' => $format,
- },
- 'format_types' => {
- 'simple-csv' => 'csv',
- 'simple-xls' => 'xls',
- },
- 'default_csv' => 1,
- 'format_hash_callbacks' => {
- 'simple-csv' => $hashcb,
- 'simple-xls' => $hashcb,
- },
+ #agent_custid isn't a cust_pay field, see hash callback
+ 'formats' => { 'simple' => [ qw(custnum agent_custid paid payinfo invnum) ] },
+ 'format_types' => { 'simple' => '' }, #force infer from file extension
+ 'default_csv' => 1, #if it's not .xls, it'll read as csv, regardless of extension
+ 'format_hash_callbacks' => { 'simple' => $hashcb },
'postinsert_callback' => sub {
my $cust_pay = shift;
my $cust_main = $cust_pay->cust_main ||