[freeside-commits] branch master updated. 2756019bdb10fe144debfc8d6436468a89954eb3

Ivan ivan at 420.am
Fri Nov 11 14:42:49 PST 2016


The branch, master has been updated
       via  2756019bdb10fe144debfc8d6436468a89954eb3 (commit)
      from  d6216f073a9a729d3265741d3aea4f4ade1c6a7f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2756019bdb10fe144debfc8d6436468a89954eb3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Nov 11 14:42:48 2016 -0800

    UX: acknowledge actions instead of silently redirecting

diff --git a/httemplate/edit/process/cust_main_attach.cgi b/httemplate/edit/process/cust_main_attach.cgi
index 2935d68..20673dc 100644
--- a/httemplate/edit/process/cust_main_attach.cgi
+++ b/httemplate/edit/process/cust_main_attach.cgi
@@ -7,11 +7,7 @@
 % $act = 'purged' if($attachnum and $purge);
 % $act = 'undeleted' if($attachnum and $undelete);
 % $act = 'deleted' if($attachnum and $delete);
-<& /elements/header-popup.html, 'Attachment ' . $act  &>
-    <SCRIPT TYPE="text/javascript">
-      topreload();
-    </SCRIPT>
-    </BODY></HTML>
+<& /elements/popup-topreload.html, mt("Attachment $act") &>
 % }
 <%init>
 
diff --git a/httemplate/edit/process/cust_main_note.cgi b/httemplate/edit/process/cust_main_note.cgi
index 2428689..1fd1367 100755
--- a/httemplate/edit/process/cust_main_note.cgi
+++ b/httemplate/edit/process/cust_main_note.cgi
@@ -2,11 +2,7 @@
 %  $cgi->param('error', $error);
 <% $cgi->redirect(popurl(2). 'cust_main_note.cgi?'. $cgi->query_string ) %>
 %} else {
-<& /elements/header-popup.html, 'Note ' . ($notenum ? 'updated' : 'added')  &>
-    <SCRIPT TYPE="text/javascript">
-      topreload();
-    </SCRIPT>
-    </BODY></HTML>
+<& /elements/popup-topreload.html, mt( 'Note '. ($notenum ? 'updated' : 'added') ) &>
 % }
 <%init>
 
diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi
index 4348873..fcae671 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 f20f20c..3087a73 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 7ccd707..5826027 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 0649261..7e33e15 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',

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/process/cust_main_attach.cgi |    6 +-----
 httemplate/edit/process/cust_main_note.cgi   |    6 +-----
 httemplate/misc/cust_main-cancel.cgi         |   11 +----------
 httemplate/misc/cust_main-suspend.cgi        |   11 +----------
 httemplate/misc/cust_main-unsuspend.cgi      |   10 +---------
 httemplate/misc/process/cancel_pkg.html      |   11 +----------
 6 files changed, 6 insertions(+), 49 deletions(-)




More information about the freeside-commits mailing list