after jumping away from the payment form to update email address, return to the payme...

diff --git a/Open-ILS/web/opac/skin/kcls/js/myopac.js b/Open-ILS/web/opac/skin/kcls/js/myopac.js
index af91e05..852a36c 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/js/myopac.js
+++ b/Open-ILS/web/opac/skin/kcls/js/myopac.js
@@ -65,6 +65,7 @@ var myopacGenericTransTemplate;
 var myopacCircTransTemplate;\r
 var addrRowTemplate;\r
 var notesTemplate;\r
+var myopacReturnToPayment = false;\r
 \r
 function myOPACInit() {\r
        if(!(G.user && G.user.session)) {\r
@@ -149,6 +150,9 @@ function myOPACChangePage( page ) {
        hideMe(hh); hideMe(pp);\r
        hideMe(bb);\r
 \r
+    if(page != 'prefs')\r
+        myopacReturnToPayment = false;\r
+\r
     var oncomplete = null;\r
 \r
        switch( page ) {\r
@@ -919,11 +923,20 @@ function myOPACUpdateEmail() {
        var req = new Request(UPDATE_EMAIL, G.user.session, email );\r
        req.send(true);\r
        if(req.result()) {\r
-               G.user.usrname(email);\r
+               G.user.email(email);\r
                hideMe($('myopac_update_email_row'));\r
                userShown = false;\r
                alertId('myopac_email_success');\r
                myOPACShowUser(true);\r
+\r
+        // user got here after trying to make a payment then deciding \r
+        // the email addr needed updating.  take the user back to the \r
+        // in-progress payment form\r
+        if(myopacReturnToPayment) {\r
+            myopacReturnToPayment = false;\r
+            myOPACChangePage("summary");\r
+            $('myopac-cc-email').innerHTML = email;\r
+        }\r
                return;\r
        }\r
 \r

diff --git a/Open-ILS/web/opac/skin/kcls/xml/myopac/myopac_summary.xml b/Open-ILS/web/opac/skin/kcls/xml/myopac/myopac_summary.xml
index 375bdaf..fb542a8 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/xml/myopac/myopac_summary.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/myopac/myopac_summary.xml
@@ -215,7 +215,7 @@
             <td>\r
                 <span id='myopac-cc-email'/>\r
                 <span style='margin-left:5px;'>\r
-                    <a href='javascript:' onclick='myOPACChangePage("prefs");'>Update</a>\r
+                    <a href='javascript:' onclick='myopacReturnToPayment=true;myOPACChangePage("prefs");'>Update</a>\r
                 </span>\r
             </td>\r
         </tr>\r