projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UX: acknowledge actions instead of silently redirecting
[freeside.git]
/
httemplate
/
misc
/
process
/
cancel_pkg.html
diff --git
a/httemplate/misc/process/cancel_pkg.html
b/httemplate/misc/process/cancel_pkg.html
index
c7a4397
..
7e33e15
100755
(executable)
--- a/
httemplate/misc/process/cancel_pkg.html
+++ b/
httemplate/misc/process/cancel_pkg.html
@@
-1,9
+1,4
@@
-<% header(emt("Package $past_method")) %>
- <SCRIPT TYPE="text/javascript">
- window.top.location.reload();
- </SCRIPT>
- </BODY>
-</HTML>
+<& /elements/popup-topreload.html, et("Package $past_method") &>
<%once>
my %past = ( 'cancel' => 'cancelled',
<%once>
my %past = ( 'cancel' => 'cancelled',
@@
-33,8
+28,10
@@
$method =~ /^(cancel|expire|suspend|adjourn|resume|uncancel)$/
$method = $1;
my $past_method = $past{$method};
$method = $1;
my $past_method = $past{$method};
+my $curuser = $FS::CurrentUser::CurrentUser;
+
die "access denied"
die "access denied"
- unless $
FS::CurrentUser::CurrentU
ser->access_right($right{$method});
+ unless $
curu
ser->access_right($right{$method});
#untaint pkgnum
my $pkgnum = $cgi->param('pkgnum');
#untaint pkgnum
my $pkgnum = $cgi->param('pkgnum');
@@
-60,7
+57,8
@@
if ( $method eq 'suspend' ) { #or 'adjourn'
$options = { map { $_ => scalar($cgi->param($_)) }
qw( suspend_bill no_suspend_bill )
$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} );
}
my $cust_pkg = qsearchs( 'cust_pkg', {'pkgnum'=>$pkgnum} );
@@
-82,6
+80,8
@@
my $bill =
my $svc_fatal = ( $cgi->param('svc_not_fatal') ne 'Y' );
my $svc_fatal = ( $cgi->param('svc_not_fatal') ne 'Y' );
+my $only_svcnum = ($method eq 'uncancel') ? [ $cgi->param('only_svcnum') ] : undef;
+
$error ||= $cust_pkg->$method( 'reason' => $reasonnum,
'date' => $date,
'resume_date' => $resume_date,
$error ||= $cust_pkg->$method( 'reason' => $reasonnum,
'date' => $date,
'resume_date' => $resume_date,
@@
-89,6
+89,7
@@
$error ||= $cust_pkg->$method( 'reason' => $reasonnum,
'bill' => $bill,
'svc_fatal' => $svc_fatal,
'options' => $options,
'bill' => $bill,
'svc_fatal' => $svc_fatal,
'options' => $options,
+ 'only_svcnum' => $only_svcnum,
);
if ($error) {
);
if ($error) {