UX: acknowledge actions instead of silently redirecting

4 files changed, 4 insertions, 39 deletions

diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi
index 4348873cf..fcae67194 100755
--- a/httemplate/misc/cust_main-cancel.cgi
+++ b/httemplate/misc/cust_main-cancel.cgi
@@ -1,13 +1,4 @@
-<& /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>
-</HTML>
+<& /elements/popup-topreload.html, mt("Customer cancelled") &>
 <%init>
 
 die "access denied"
diff --git a/httemplate/misc/cust_main-suspend.cgi b/httemplate/misc/cust_main-suspend.cgi
index f20f20c13..3087a7371 100755
--- a/httemplate/misc/cust_main-suspend.cgi
+++ b/httemplate/misc/cust_main-suspend.cgi
@@ -1,13 +1,4 @@
-<& /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>
-</HTML>
+<& /elements/popup-topreload.html, mt("Customer suspended") &>
 <%init>
 
 #false laziness w/cust_main-cancel.cgi
diff --git a/httemplate/misc/cust_main-unsuspend.cgi b/httemplate/misc/cust_main-unsuspend.cgi
index 7ccd707bf..5826027b2 100755
--- a/httemplate/misc/cust_main-unsuspend.cgi
+++ b/httemplate/misc/cust_main-unsuspend.cgi
@@ -1,12 +1,4 @@
-<& /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>
-</HTML>
+<& /elements/popup-topreload.html, mt("Customer unsuspended") &>
 <%init>
 
 #false laziness w/cust_main-cancel.cgi
diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html
index 0649261e7..7e33e15c0 100755
--- a/httemplate/misc/process/cancel_pkg.html
+++ b/httemplate/misc/process/cancel_pkg.html
@@ -1,13 +1,4 @@
-<& /elements/header-popup.html, emt("Package $past_method") &>
-  <script src="<% $fsurl %>elements/js.cookie.js"></script>
-  <SCRIPT TYPE="text/javascript">
-    Cookies.set('freeside_status', <% mt("Package $past_method") |js_string %>,{
-                  expires: 0.0035
-    });
-    topreload();
-  </SCRIPT>
-  </BODY>
-</HTML>
+<& /elements/popup-topreload.html, et("Package $past_method") &>
 <%once>
 
 my %past = ( 'cancel'   => 'cancelled',