UX: acknowledge actions instead of silently redirecting

4 files changed, 19 insertions, 8 deletions

diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi
index 73c4deb7a..4348873cf 100755
--- a/httemplate/misc/cust_main-cancel.cgi
+++ b/httemplate/misc/cust_main-cancel.cgi
@@ -1,5 +1,9 @@
 <& /elements/header-popup.html, mt("Customer cancelled") &>
+  <script src="<% $fsurl %>elements/js.cookie.js"></script>
   <SCRIPT TYPE="text/javascript">
+    Cookies.set('freeside_status', <% mt("Customer cancelled") |js_string %>,{
+                  expires: 0.0035
+    });
     topreload();
   </SCRIPT>
   </BODY>
diff --git a/httemplate/misc/cust_main-suspend.cgi b/httemplate/misc/cust_main-suspend.cgi
index e81e2b490..f20f20c13 100755
--- a/httemplate/misc/cust_main-suspend.cgi
+++ b/httemplate/misc/cust_main-suspend.cgi
@@ -1,5 +1,9 @@
 <& /elements/header-popup.html, mt("Customer suspended") &>
+  <script src="<% $fsurl %>elements/js.cookie.js"></script>
   <SCRIPT TYPE="text/javascript">
+    Cookies.set('freeside_status', <% mt("Customer suspended") |js_string %>,{
+                  expires: 0.0035
+    });
     topreload();
   </SCRIPT>
   </BODY>
diff --git a/httemplate/misc/cust_main-unsuspend.cgi b/httemplate/misc/cust_main-unsuspend.cgi
index 99ec70a23..7ccd707bf 100755
--- a/httemplate/misc/cust_main-unsuspend.cgi
+++ b/httemplate/misc/cust_main-unsuspend.cgi
@@ -1,5 +1,8 @@
 <& /elements/header-popup.html, mt("Customer unsuspended") &>
   <SCRIPT TYPE="text/javascript">
+    Cookies.set('freeside_status', <% mt("Customer unsuspended") |js_string %>,{
+                  expires: 0.0035
+    });
     topreload();
   </SCRIPT>
   </BODY>
diff --git a/httemplate/misc/unsusp_pkg.cgi b/httemplate/misc/unsusp_pkg.cgi
index ad7effcb3..e7157db56 100755
--- a/httemplate/misc/unsusp_pkg.cgi
+++ b/httemplate/misc/unsusp_pkg.cgi
@@ -1,15 +1,13 @@
 %if ( $error ) {
 %  errorpage($error);
 %} else {
-%  my $cookie = CGI::Cookie->new( -name    => 'freeside_status',
-%                                 -value   => mt('Package unsuspended'),
-%                                 -expires => '+5m',
-%                               );
-% #$r->headers_out->add( 'Set-Cookie' => $cookie->as_string );
 <% $cgi->redirect(
-     -uri => popurl(2). "view/cust_main.cgi?show=packages;custnum=".$cust_pkg->getfield('custnum'),
-     -cookie => $cookie
-  )
+     -uri    => popurl(2). "view/cust_main.cgi?show=packages;custnum=$custnum",
+     -cookie => CGI::Cookie->new( -name    => 'freeside_status',
+                                  -value   => mt('Package unsuspended'),
+                                  -expires => '+5m',
+                                ),
+   )
 %>
 %}
 <%init>
@@ -26,4 +24,6 @@ my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 
 my $error = $cust_pkg->unsuspend;
 
+my $custnum = $cust_pkg->custnum;
+
 </%init>