projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e68cf7
)
fix compile bug in jayce's commit adding cust_bill->cancel method, RT#23357
author
Ivan Kohler
<ivan@freeside.biz>
Sun, 18 Jan 2015 20:25:50 +0000
(12:25 -0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Sun, 18 Jan 2015 20:25:50 +0000
(12:25 -0800)
FS/FS/cust_bill.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
0b8cb02
..
07c3320
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-678,21
+678,22
@@
sub cancel {
join(', ', map { "$_: $opt{$_}" } keys %opt ). "\n"
if $DEBUG;
join(', ', map { "$_: $opt{$_}" } keys %opt ). "\n"
if $DEBUG;
- return ( '
a
ccess denied' )
+ return ( '
A
ccess denied' )
unless $FS::CurrentUser::CurrentUser->access_right('Cancel customer');
my @pkgs = $self->cust_pkg;
unless $FS::CurrentUser::CurrentUser->access_right('Cancel customer');
my @pkgs = $self->cust_pkg;
- if ( !$opt{nobill} && $conf->exists('bill_usage_on_cancel') ) {
+ if ( !$opt{nobill} && $
self->
conf->exists('bill_usage_on_cancel') ) {
$opt{nobill} = 1;
my $error = $self->cust_main->bill( pkg_list => [ @pkgs ], cancel => 1 );
warn "Error billing during cancel, custnum ". $self->custnum. ": $error"
if $error;
}
$opt{nobill} = 1;
my $error = $self->cust_main->bill( pkg_list => [ @pkgs ], cancel => 1 );
warn "Error billing during cancel, custnum ". $self->custnum. ": $error"
if $error;
}
- grep { $_ } map { $_->cancel(%opt) }
- grep {! $_->getfield('cancel') }
- @pkgs;
+ grep { $_ }
+ map { $_->cancel(%opt) }
+ grep { ! $_->getfield('cancel') }
+ @pkgs;
}
=item cust_bill_pay
}
=item cust_bill_pay