'Cancel customer package later',
'Un-cancel customer package',
'Delay suspension events',
+ 'Customize billing during suspension',
'Add on-the-fly cancel reason', #NEW
'Add on-the-fly suspend reason', #NEW
'Edit customer package invoice details', #NEW
}
+ # some false laziness with @onetime above,
+ # but for use when multiple old acls trigger a single new acl
+ # (keys/values reversed from @onetime, expects arrayref value)
+ my @onetime_bynew = (
+ 'Customize billing during suspension' => [ 'Suspend customer package', 'Suspend customer package later' ],
+ );
+ while ( @onetime_bynew ) {
+ my( $new_acl, $old_acl ) = splice(@onetime_bynew, 0, 2);
+ ( my $journal = 'ACL_'.lc($new_acl) ) =~ s/\W/_/g;
+ next if FS::upgrade_journal->is_done($journal);
+ # grant $new_acl to all groups who have one of @old_acl
+ for my $group (@all_groups) {
+ next unless grep { $group->access_right($_) } @$old_acl;
+ next if $group->access_right($new_acl);
+ my $access_right = FS::access_right->new( {
+ 'righttype' => 'FS::access_group',
+ 'rightobjnum' => $group->groupnum,
+ 'rightname' => $new_acl,
+ } );
+ my $error = $access_right->insert;
+ die $error if $error;
+ }
+
+ FS::upgrade_journal->set_done($journal);
+
+ }
+
### ACL_download_report_data
if ( !FS::upgrade_journal->is_done('ACL_download_report_data') ) {
&>
% }
-% if ( $method eq 'adjourn' || $method eq 'suspend' ) {
+% if (( $method eq 'adjourn' || $method eq 'suspend' ) && $curuser->access_right('Customize billing during suspension')) {
<TR><TD COLSPAN=2>
% if ( $part_pkg->option('suspend_bill', 1) ) {
<& /elements/checkbox.html, name=>'no_suspend_bill', value=>'Y' &>
$method = $1;
my $past_method = $past{$method};
+my $curuser = $FS::CurrentUser::CurrentUser;
+
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right($right{$method});
+ unless $curuser->access_right($right{$method});
#untaint pkgnum
my $pkgnum = $cgi->param('pkgnum');
$options = { map { $_ => scalar($cgi->param($_)) }
qw( suspend_bill no_suspend_bill )
- };
+ }
+ if $curuser->access_right('Customize billing during suspension');
}
my $cust_pkg = qsearchs( 'cust_pkg', {'pkgnum'=>$pkgnum} );