summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2015-01-18 12:25:50 -0800
committerIvan Kohler <ivan@freeside.biz>2015-01-18 12:25:50 -0800
commitdc89d3d583bff237f56dac6dcda57412ba0584a8 (patch)
treeb89348daa5de4005f3f3e79e3046dd056e6e4e8d
parent4e68cf76788b220cc15f2a080df5e7a1ea4962b8 (diff)
fix compile bug in jayce's commit adding cust_bill->cancel method, RT#23357
-rw-r--r--FS/FS/cust_bill.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 0b8cb0254..07c33204e 100644
--- 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;
- return ( 'access denied' )
+ return ( 'Access denied' )
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;
}
- grep { $_ } map { $_->cancel(%opt) }
- grep {! $_->getfield('cancel') }
- @pkgs;
+ grep { $_ }
+ map { $_->cancel(%opt) }
+ grep { ! $_->getfield('cancel') }
+ @pkgs;
}
=item cust_bill_pay