X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpay_batch.pm;h=bde8fdbf705f61bca9536f45625454b95b7c1a22;hb=80e675c7305768010f8b08ef2ebdfb936432e84d;hp=e0531f4454f3ce8b688398493ad3d34bf7ad812f;hpb=978cc3533b38efa38c63898fa7814a4b38efdee3;p=freeside.git diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm index e0531f445..bde8fdbf7 100644 --- a/FS/FS/pay_batch.pm +++ b/FS/FS/pay_batch.pm @@ -5,8 +5,11 @@ use vars qw( @ISA $DEBUG %import_info %export_info $conf ); use Time::Local; use Text::CSV_XS; use FS::Record qw( dbh qsearch qsearchs ); -use FS::cust_pay; use FS::Conf; +use FS::cust_pay; +use FS::agent; +use Date::Parse qw(str2time); +use Business::CreditCard qw(cardtype); @ISA = qw(FS::Record); @@ -38,6 +41,8 @@ from FS::Record. The following fields are currently supported: =item batchnum - primary key +=item agentnum - optional agent number for agent batches + =item payby - CARD or CHEK =item status - O (Open), I (In-transit), or R (Resolved) @@ -110,6 +115,7 @@ sub check { $self->ut_numbern('batchnum') || $self->ut_enum('payby', [ 'CARD', 'CHEK' ]) || $self->ut_enum('status', [ 'O', 'I', 'R' ]) + || $self->ut_foreign_keyn('agentnum', 'agent', 'agentnum') ; return $error if $error; @@ -195,16 +201,24 @@ sub import_results { my $info = $import_info{$format} or die "unknown format $format"; - my $filetype = $info->{'filetype'}; # CSV or fixed + my $job = $param->{'job'}; + $job->update_statustext(0) if $job; + + my $conf = new FS::Conf; + + my $filetype = $info->{'filetype'}; # CSV, fixed, variable my @fields = @{ $info->{'fields'}}; my $formatre = $info->{'formatre'}; # for fixed + my $parse = $info->{'parse'}; # for variable my @all_values; my $begin_condition = $info->{'begin_condition'}; my $end_condition = $info->{'end_condition'}; my $end_hook = $info->{'end_hook'}; + my $skip_condition = $info->{'skip_condition'}; my $hook = $info->{'hook'}; my $approved_condition = $info->{'approved'}; my $declined_condition = $info->{'declined'}; + my $close_condition = $info->{'close_condition'}; my $csv = new Text::CSV_XS; @@ -221,17 +235,12 @@ sub import_results { my $reself = $self->select_for_update; - unless ( $reself->status eq 'I' ) { + if ( $reself->status ne 'I' + and !$conf->exists('batch-manual_approval') ) { $dbh->rollback if $oldAutoCommit; return "batchnum ". $self->batchnum. "no longer in transit"; } - my $error = $self->set_status('R'); - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return $error; - } - my $total = 0; my $line; @@ -271,20 +280,36 @@ sub import_results { }; push @all_values, [ $csv->fields(), $line ]; }elsif ($filetype eq 'fixed'){ - my @values = ( $line =~ /$formatre/, $line ); + my @values = ( $line =~ /$formatre/ ); unless (@values) { $dbh->rollback if $oldAutoCommit; return "can't parse: ". $line; }; + push @values, $line; + push @all_values, \@values; + } + elsif ($filetype eq 'variable') { + my @values = ( eval { $parse->($self, $line) } ); + if( $@ ) { + $dbh->rollback if $oldAutoCommit; + return $@; + }; + push @values, $line; push @all_values, \@values; - }else{ + } + else { $dbh->rollback if $oldAutoCommit; return "Unknown file type $filetype"; } } } + my $num = 0; foreach (@all_values) { + if($job) { + $num++; + $job->update_statustext(int(100 * $num/scalar(@all_values))); + } my @values = @$_; my %hash; @@ -295,8 +320,13 @@ sub import_results { $hash{$field} = $value; } - if ( defined($begin_condition) and &{$begin_condition}(\%hash, $line)) { - undef $begin_condition; + if ( defined($begin_condition) ) { + if ( &{$begin_condition}(\%hash, $line) ) { + undef $begin_condition; + } + else { + next; + } } if ( defined($end_condition) and &{$end_condition}(\%hash, $line) ) { @@ -309,6 +339,10 @@ sub import_results { last; } + if ( defined($skip_condition) and &{$skip_condition}(\%hash, $line) ) { + next; + } + my $cust_pay_batch = qsearchs('cust_pay_batch', { 'paybatchnum' => $hash{'paybatchnum'}+0 } ); unless ( $cust_pay_batch ) { @@ -317,84 +351,90 @@ sub import_results { my $custnum = $cust_pay_batch->custnum, my $payby = $cust_pay_batch->payby, - my $new_cust_pay_batch = new FS::cust_pay_batch { $cust_pay_batch->hash }; - &{$hook}(\%hash, $cust_pay_batch->hashref); + my $new_cust_pay_batch = new FS::cust_pay_batch { $cust_pay_batch->hash }; + + my $error = ''; if ( &{$approved_condition}(\%hash) ) { - $new_cust_pay_batch->status('Approved'); + foreach ('paid', '_date', 'payinfo') { + $new_cust_pay_batch->$_($hash{$_}) if $hash{$_}; + } + $error = $new_cust_pay_batch->approve($hash{'paybatch'} || $self->batchnum); + $total += $hash{'paid'}; } elsif ( &{$declined_condition}(\%hash) ) { - $new_cust_pay_batch->status('Declined'); + $error = $new_cust_pay_batch->decline; } - my $error = $new_cust_pay_batch->replace($cust_pay_batch); if ( $error ) { $dbh->rollback if $oldAutoCommit; - return "error updating status of paybatchnum $hash{'paybatchnum'}: $error\n"; + return $error; } - if ( $new_cust_pay_batch->status =~ /Approved/i ) { - - my $cust_pay = new FS::cust_pay ( { - 'custnum' => $custnum, - 'payby' => $payby, - 'paybatch' => $self->batchnum, - map { $_ => $hash{$_} } (qw( paid _date payinfo )), - } ); - $error = $cust_pay->insert; - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return "error adding payment paybatchnum $hash{'paybatchnum'}: $error\n"; + # purge CVV when the batch is processed + if ( $payby =~ /^(CARD|DCRD)$/ ) { + my $payinfo = $hash{'payinfo'} || $cust_pay_batch->payinfo; + if ( ! grep { $_ eq cardtype($payinfo) } + $conf->config('cvv-save') ) { + $new_cust_pay_batch->cust_main->remove_cvv; } - $total += $hash{'paid'}; - - $cust_pay->cust_main->apply_payments; - - } elsif ( $new_cust_pay_batch->status =~ /Declined/i ) { - #false laziness w/cust_main::collect - - my $due_cust_event = $new_cust_pay_batch->cust_main->due_cust_event( - #'check_freq' => '1d', #? - 'eventtable' => 'cust_pay_batch', - 'objects' => [ $new_cust_pay_batch ], - ); - unless( ref($due_cust_event) ) { - $dbh->rollback if $oldAutoCommit; - return $due_cust_event; - } - - foreach my $cust_event ( @$due_cust_event ) { - - #XXX lock event - - #re-eval event conditions (a previous event could have changed things) - next unless $cust_event->test_conditions; + } - if ( my $error = $cust_event->do_event() ) { - # gah, even with transactions. - #$dbh->commit if $oldAutoCommit; #well. - $dbh->rollback if $oldAutoCommit; - return $error; - } - - } + } # foreach (@all_values) + my $close = 1; + if ( defined($close_condition) ) { + # Allow the module to decide whether to close the batch. + # $close_condition can also die() to abort the whole import. + $close = eval { $close_condition->($self) }; + if ( $@ ) { + $dbh->rollback; + die $@; } - } - + if ( $close ) { + my $error = $self->set_status('R'); + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + $dbh->commit or die $dbh->errstr if $oldAutoCommit; ''; } -sub export_batch { +use MIME::Base64; +use Storable 'thaw'; +use Data::Dumper; +sub process_import_results { + my $job = shift; + my $param = thaw(decode_base64(shift)); + $param->{'job'} = $job; + warn Dumper($param) if $DEBUG; + my $batchnum = delete $param->{'batchnum'} or die "no batchnum specified\n"; + my $batch = FS::pay_batch->by_key($batchnum) or die "batchnum '$batchnum' not found\n"; + + my $file = $param->{'uploaded_files'} or die "no files provided\n"; + $file =~ s/^(\w+):([\.\w]+)$/$2/; + my $dir = '%%%FREESIDE_CACHE%%%/cache.' . $FS::UID::datasrc; + open( $param->{'filehandle'}, + '<', + "$dir/$file" ) + or die "unable to open '$file'.\n"; + my $error = $batch->import_results($param); + unlink $file; + die $error if $error; +} + # Formerly httemplate/misc/download-batch.cgi +sub export_batch { my $self = shift; my $conf = new FS::Conf; my $format = shift || $conf->config('batch-default_format') @@ -402,26 +442,23 @@ sub export_batch { my $info = $export_info{$format} or die "Format not found: '$format'\n"; &{$info->{'init'}}($conf) if exists($info->{'init'}); + my $curuser = $FS::CurrentUser::CurrentUser; + my $oldAutoCommit = $FS::UID::AutoCommit; local $FS::UID::AutoCommit = 0; my $dbh = dbh; - my $error; - my $first_download; - if($self->status eq 'O') { + my $status = $self->status; + if ($status eq 'O') { $first_download = 1; - } - elsif($self->status eq 'I' and - $FS::CurrentUser::CurrentUser->access_right('Reprocess batches')) { + my $error = $self->set_status('I'); + die "error updating pay_batch status: $error\n" if $error; + } elsif ($status eq 'I' && $curuser->access_right('Reprocess batches')) { $first_download = 0; + } else { + die "No pending batch.\n"; } - else { - die "No pending batch.\n" - } - - $error = $self->set_status('I'); - die "error updating pay_batch status: $error\n" if $error; my $batch = ''; my $batchtotal = 0; @@ -429,48 +466,77 @@ sub export_batch { my @cust_pay_batch = sort { $a->paybatchnum <=> $b->paybatchnum } qsearch('cust_pay_batch', { batchnum => $self->batchnum } ); - - my $h = $info->{'header'}; - if(ref($h) eq 'CODE') { - $batch .= &$h($self, \@cust_pay_batch) . "\n"; - } - else { - $batch .= $h . "\n"; + + # handle batch-increment_expiration option + if ( $self->payby eq 'CARD' ) { + my ($cmon, $cyear) = (localtime(time))[4,5]; + foreach (@cust_pay_batch) { + my $etime = str2time($_->exp) or next; + my ($day, $mon, $year) = (localtime($etime))[3,4,5]; + if( $conf->exists('batch-increment_expiration') ) { + $year++ while( $year < $cyear or ($year == $cyear and $mon <= $cmon) ); + $_->exp( sprintf('%4u-%02u-%02u', $year + 1900, $mon+1, $day) ); + } + $_->setfield('expmmyy', sprintf('%02u%02u', $mon+1, $year % 100)); + } } - foreach my $cust_pay_batch (@cust_pay_batch) { - if($first_download) { + + if ($first_download) { #remove or reduce entries if customer's balance changed + + my @new = (); + foreach my $cust_pay_batch (@cust_pay_batch) { + my $balance = $cust_pay_batch->cust_main->balance; - $error = ''; - if($balance <= 0) { # then don't charge this customer - $error = $cust_pay_batch->delete; - undef $cust_pay_batch; - } - elsif($balance < $cust_pay_batch->amount) { # then reduce the charge to the remaining balance + if ($balance <= 0) { # then don't charge this customer + my $error = $cust_pay_batch->delete; + if ( $error ) { + $dbh->rollback or die $dbh->errstr if $oldAutoCommit; + die $error; + } + next; + } elsif ($balance < $cust_pay_batch->amount) { + # reduce the charge to the remaining balance $cust_pay_batch->amount($balance); - $error = $cust_pay_batch->replace; + my $error = $cust_pay_batch->replace; + if ( $error ) { + $dbh->rollback or die $dbh->errstr if $oldAutoCommit; + die $error; + } } # else $balance >= $cust_pay_batch->amount - if($error) { - $dbh->rollback or die $dbh->errstr if $oldAutoCommit; - die $error; - } - } - if($cust_pay_batch) { # that is, it wasn't deleted - $batchcount++; - $batchtotal += $cust_pay_batch->amount; - $batch .= &{$info->{'row'}}($cust_pay_batch, $self) . "\n"; + + push @new, $cust_pay_batch; } + @cust_pay_batch = @new; + } - my $f = $info->{'footer'}; - if(ref($f) eq 'CODE') { - $batch .= &$f($self, $batchcount, $batchtotal) . "\n"; + + my $delim = exists($info->{'delimiter'}) ? $info->{'delimiter'} : "\n"; + + my $h = $info->{'header'}; + if (ref($h) eq 'CODE') { + $batch .= &$h($self, \@cust_pay_batch). $delim; + } else { + $batch .= $h. $delim; } - else { - $batch .= $f . "\n"; + + foreach my $cust_pay_batch (@cust_pay_batch) { + $batchcount++; + $batchtotal += $cust_pay_batch->amount; + $batch .= + &{$info->{'row'}}($cust_pay_batch, $self, $batchcount, $batchtotal). + $delim; + } + + my $f = $info->{'footer'}; + if (ref($f) eq 'CODE') { + $batch .= &$f($self, $batchcount, $batchtotal). $delim; + } else { + $batch .= $f. $delim; } if ($info->{'autopost'}) { - $error = &{$info->{'autopost'}}($self, $batch); + my $error = &{$info->{'autopost'}}($self, $batch); if($error) { $dbh->rollback or die $dbh->errstr if $oldAutoCommit; die $error; @@ -481,6 +547,52 @@ sub export_batch { return $batch; } +sub manual_approve { + my $self = shift; + my $date = time; + my %opt = @_; + my $paybatch = $opt{'paybatch'} || $self->batchnum; + my $usernum = $opt{'usernum'} || die "manual approval requires a usernum"; + my $conf = FS::Conf->new; + return 'manual batch approval disabled' + if ( ! $conf->exists('batch-manual_approval') ); + return 'batch already resolved' if $self->status eq 'R'; + return 'batch not yet submitted' if $self->status eq 'O'; + + local $SIG{HUP} = 'IGNORE'; + local $SIG{INT} = 'IGNORE'; + local $SIG{QUIT} = 'IGNORE'; + local $SIG{TERM} = 'IGNORE'; + local $SIG{TSTP} = 'IGNORE'; + local $SIG{PIPE} = 'IGNORE'; + + my $oldAutoCommit = $FS::UID::AutoCommit; + local $FS::UID::AutoCommit = 0; + my $dbh = dbh; + + my $payments = 0; + foreach my $cust_pay_batch ( + qsearch('cust_pay_batch', { batchnum => $self->batchnum, + status => '' }) + ) { + my $new_cust_pay_batch = new FS::cust_pay_batch { + $cust_pay_batch->hash, + 'paid' => $cust_pay_batch->amount, + '_date' => $date, + 'usernum' => $usernum, + }; + my $error = $new_cust_pay_batch->approve($paybatch); + if ( $error ) { + $dbh->rollback; + return 'paybatchnum '.$cust_pay_batch->paybatchnum.": $error"; + } + $payments++; + } + $self->set_status('R'); + $dbh->commit; + return; +} + =back =head1 BUGS