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 a106b84..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',
@@ -33,8 +28,10 @@ $method =~ /^(cancel|expire|suspend|adjourn|resume|uncancel)$/
 $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');
@@ -60,22 +57,18 @@ if ( $method eq 'suspend' ) { #or 'adjourn'
 
   $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} );
 
-#untaint reasonnum
-my $reasonnum = $cgi->param('reasonnum');
-if ( $method !~ /^(unsuspend|uncancel)$/ ) {
-  $reasonnum =~ /^(-?\d+)$/ or die "Illegal reasonnum";
-  $reasonnum = $1;
-
-  if ($reasonnum == -1) {
-    $reasonnum = {
-      'typenum' => scalar( $cgi->param('newreasonnumT') ),
-      'reason'  => scalar( $cgi->param('newreasonnum' ) ),
-    };
+#untaint reasonnum, and set up new reason if appropriate
+my ($reasonnum, $error);
+if ($method ne 'unsuspend' and $method ne 'uncancel') {
+  ($reasonnum, $error) = $m->comp('elements/reason');
+  if (!$reasonnum) {
+    $error ||= 'Reason required';
   }
 }
 
@@ -87,13 +80,16 @@ my $bill =
 
 my $svc_fatal = ( $cgi->param('svc_not_fatal') ne 'Y' );
 
-my $error = $cust_pkg->$method( 'reason'      => $reasonnum,
+my $only_svcnum = ($method eq 'uncancel') ? [ $cgi->param('only_svcnum') ] : undef;
+
+$error ||=  $cust_pkg->$method( 'reason'      => $reasonnum,
                                 'date'        => $date,
                                 'resume_date' => $resume_date,
                                 'last_bill'   => $last_bill,
                                 'bill'        => $bill,
                                 'svc_fatal'   => $svc_fatal,
                                 'options'     => $options,
+                                'only_svcnum' => $only_svcnum,
                               );
 
 if ($error) {