projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT##29285: State field not needed for New Zealand
[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
cfba664
..
d28085c
100644
(file)
--- a/
FS/FS/cust_pay_batch.pm
+++ b/
FS/FS/cust_pay_batch.pm
@@
-130,6
+130,8
@@
and replace methods.
sub check {
my $self = shift;
sub check {
my $self = shift;
+ my $conf = new FS::Conf;
+
my $error =
$self->ut_numbern('paybatchnum')
|| $self->ut_numbern('trancode') #deprecated
my $error =
$self->ut_numbern('paybatchnum')
|| $self->ut_numbern('trancode') #deprecated
@@
-138,7
+140,9
@@
sub check {
|| $self->ut_number('custnum')
|| $self->ut_text('address1')
|| $self->ut_textn('address2')
|| $self->ut_number('custnum')
|| $self->ut_text('address1')
|| $self->ut_textn('address2')
- || $self->ut_text('city')
+ || ($conf->exists('cust_main-no_city_in_address')
+ ? $self->ut_textn('city')
+ : $self->ut_text('city'))
|| $self->ut_textn('state')
;
|| $self->ut_textn('state')
;
@@
-311,15
+315,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,
@@
-361,7
+365,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
@@
-388,14
+392,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',