projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix pg replication slave display in status
[freeside.git]
/
FS
/
FS
/
cust_pay_batch.pm
diff --git
a/FS/FS/cust_pay_batch.pm
b/FS/FS/cust_pay_batch.pm
index
e1e32d3
..
2ab76d5
100644
(file)
--- a/
FS/FS/cust_pay_batch.pm
+++ b/
FS/FS/cust_pay_batch.pm
@@
-16,6
+16,9
@@
use FS::cust_bill;
# 3 is even more information including possibly sensitive data
$DEBUG = 0;
# 3 is even more information including possibly sensitive data
$DEBUG = 0;
+#@encrypted_fields = ('payinfo');
+sub nohistory_fields { ('payinfo'); }
+
=head1 NAME
FS::cust_pay_batch - Object methods for batch cards
=head1 NAME
FS::cust_pay_batch - Object methods for batch cards
@@
-308,15
+311,15
@@
sub approve {
my %opt = @_;
my $paybatchnum = $new->paybatchnum;
my $old = qsearchs('cust_pay_batch', { paybatchnum => $paybatchnum })
my %opt = @_;
my $paybatchnum = $new->paybatchnum;
my $old = qsearchs('cust_pay_batch', { paybatchnum => $paybatchnum })
- or return "paybatchnum $paybatchnum not found";
+ or return "
cannot approve,
paybatchnum $paybatchnum not found";
# leave these restrictions in place until TD EFT is converted over
# to B::BP
# leave these restrictions in place until TD EFT is converted over
# to B::BP
- return "
paybatchnum $paybatchnum
already resolved ('".$old->status."')"
+ return "
cannot approve paybatchnum $paybatchnum,
already resolved ('".$old->status."')"
if $old->status;
$new->status('Approved');
my $error = $new->replace($old);
if ( $error ) {
if $old->status;
$new->status('Approved');
my $error = $new->replace($old);
if ( $error ) {
- return "error
updating status of
paybatchnum $paybatchnum: $error\n";
+ return "error
approving
paybatchnum $paybatchnum: $error\n";
}
my $cust_pay = new FS::cust_pay ( {
'custnum' => $new->custnum,
}
my $cust_pay = new FS::cust_pay ( {
'custnum' => $new->custnum,
@@
-358,7
+361,7
@@
sub decline {
my $paybatchnum = $new->paybatchnum;
my $old = qsearchs('cust_pay_batch', { paybatchnum => $paybatchnum })
my $paybatchnum = $new->paybatchnum;
my $old = qsearchs('cust_pay_batch', { paybatchnum => $paybatchnum })
- or return "paybatchnum $paybatchnum not found";
+ or return "
cannot decline,
paybatchnum $paybatchnum not found";
if ( $old->status ) {
# Handle the case where payments are rejected after the batch has been
# approved. FS::pay_batch::import_results won't allow results to be
if ( $old->status ) {
# Handle the case where payments are rejected after the batch has been
# approved. FS::pay_batch::import_results won't allow results to be
@@
-385,14
+388,14
@@
sub decline {
}
else {
# normal case: refuse to do anything
}
else {
# normal case: refuse to do anything
- return "
paybatchnum $paybatchnum
already resolved ('".$old->status."')";
+ return "
cannot decline paybatchnum $paybatchnum,
already resolved ('".$old->status."')";
}
} # !$old->status
$new->status('Declined');
$new->error_message($reason);
my $error = $new->replace($old);
if ( $error ) {
}
} # !$old->status
$new->status('Declined');
$new->error_message($reason);
my $error = $new->replace($old);
if ( $error ) {
- return "error
updating status of
paybatchnum $paybatchnum: $error\n";
+ return "error
declining
paybatchnum $paybatchnum: $error\n";
}
my $due_cust_event = $new->cust_main->due_cust_event(
'eventtable' => 'cust_pay_batch',
}
my $due_cust_event = $new->cust_main->due_cust_event(
'eventtable' => 'cust_pay_batch',