summaryrefslogtreecommitdiff
path: root/FS/FS
diff options
context:
space:
mode:
authorJonathan Prykop <jonathan@freeside.biz>2015-03-04 21:29:30 -0600
committerJonathan Prykop <jonathan@freeside.biz>2015-03-09 21:08:25 -0500
commita4b5a3e0da1e747e5937be1cc69841158743f8a9 (patch)
tree9e7a41e50506135b2c779e9be3cb8834fedc5355 /FS/FS
parent5edf8d52173c8579a1d7baf14ca548aa39e211c8 (diff)
RT#30825 Modernize Bulk payment importing [fixed format handling]
Diffstat (limited to 'FS/FS')
-rw-r--r--FS/FS/cust_pay.pm20
1 files changed, 5 insertions, 15 deletions
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index fae94c3d3..d2de5f80a 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -1179,8 +1179,6 @@ sub process_upgrade_paybatch {
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'};
@@ -1234,19 +1232,11 @@ sub process_batch_import {
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 ||