projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix localization cache, #27276
[freeside.git]
/
FS
/
FS
/
cust_pay.pm
diff --git
a/FS/FS/cust_pay.pm
b/FS/FS/cust_pay.pm
index
0669e1a
..
b7189a8
100644
(file)
--- a/
FS/FS/cust_pay.pm
+++ b/
FS/FS/cust_pay.pm
@@
-9,6
+9,7
@@
use vars qw( $DEBUG $me $conf @encrypted_fields
use Date::Format;
use Business::CreditCard;
use Text::Template;
use Date::Format;
use Business::CreditCard;
use Text::Template;
+use FS::Misc::DateTime qw( parse_datetime ); #for batch_import
use FS::Record qw( dbh qsearch qsearchs );
use FS::CurrentUser;
use FS::payby;
use FS::Record qw( dbh qsearch qsearchs );
use FS::CurrentUser;
use FS::payby;
@@
-36,6
+37,7
@@
FS::UID->install_callback( sub {
} );
@encrypted_fields = ('payinfo');
} );
@encrypted_fields = ('payinfo');
+sub nohistory_fields { ('payinfo'); }
=head1 NAME
=head1 NAME
@@
-168,7
+170,7
@@
Creates a new payment. To add the payment to the databse, see L<"insert">.
=cut
sub table { 'cust_pay'; }
=cut
sub table { 'cust_pay'; }
-sub cust_linked { $_[0]->cust_main_custnum; }
+sub cust_linked { $_[0]->cust_main_custnum
|| $_[0]->custnum
; }
sub cust_unlinked_msg {
my $self = shift;
"WARNING: can't find cust_main.custnum ". $self->custnum.
sub cust_unlinked_msg {
my $self = shift;
"WARNING: can't find cust_main.custnum ". $self->custnum.
@@
-1090,9
+1092,12
@@
Inserts new payments.
sub batch_import {
my $param = shift;
sub batch_import {
my $param = shift;
- my $fh = $param->{filehandle};
+ my $fh = $param->{filehandle};
+ my $format = $param->{'format'};
+
my $agentnum = $param->{agentnum};
my $agentnum = $param->{agentnum};
- my $format = $param->{'format'};
+ my $_date = $param->{_date};
+ $_date = parse_datetime($_date) if $_date && $_date =~ /\D/;
my $paybatch = $param->{'paybatch'};
# here is the agent virtualization
my $paybatch = $param->{'paybatch'};
# here is the agent virtualization
@@
-1143,6
+1148,7
@@
sub batch_import {
payby => $payby,
paybatch => $paybatch,
);
payby => $payby,
paybatch => $paybatch,
);
+ $cust_pay{_date} = $_date if $_date;
my $cust_main;
foreach my $field ( @fields ) {
my $cust_main;
foreach my $field ( @fields ) {