Fix for ajax error on storefront

abantecart · Jan 19, 2014 · 10924a6 · 10924a6
1 parent 4350cf3
commit 10924a6
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 23 deletions.
diff --git a/public_html/storefront/view/default/javascript/common.js b/public_html/storefront/view/default/javascript/common.js
@@ -99,12 +99,16 @@ function getURLVar(urlVarName) {
 jQuery(function($){
     $('#footer').ajaxError(function(e, jqXHR, settings, exception){
         var error_msg = $.parseJSON(jqXHR.responseText);
+        var error_text = 'Unknown Error!'
+        if (error_msg) {
+        	error_text = error_msg.error;
+        } 
         $('#ajax_error').remove();
         var error_box = $('<div id="ajax_error"><a href="#TB_inline?height=115&width=300&inlineId=hiddenModalContent&modal=true" class="thickbox"></a></div>')
             .css('display','none');
         $('#footer').after(error_box);
         var $dialog = $('<div id="hiddenModalContent"></div>')
-            .html('<div style="text-align: center;"><b>' + exception + '</b><br/><br/>' + error_msg.error + '<p><input type="button" onclick="tb_remove()" value="  Ok  "></p></div>')
+            .html('<div style="text-align: center;"><b>' + exception + '</b><br/><br/>' + error_text + '<p><input type="button" onclick="tb_remove()" value="  Ok  "></p></div>')
             .css({'display':'none'});
         $('#ajax_error a').after($dialog);
         tb_init('#ajax_error a.thickbox');

diff --git a/public_html/storefront/view/default_html5/javascript/common.js b/public_html/storefront/view/default_html5/javascript/common.js
@@ -18,8 +18,6 @@ $(document).ready(function() {
         $('#filter_keyword').focus();
     });
 
-
-
 	if (!route) {
 		$('#tab_home').addClass('selected');
 	} else {
@@ -60,8 +58,34 @@ $(document).ready(function() {
 		$(this).tooltip('show');
 	});
 
+    $('#footer').ajaxError(function(e, jqXHR, settings, exception){
+        var error_msg = $.parseJSON(jqXHR.responseText);
+        var error_text = 'Unknown AJAX Error!'
+        if (error_msg) {
+        	error_text = error_msg.error;
+        } 
+        error_text = '<div class="alert alert-error">' + error_text + '</div>';
+		//show error message
+		showMsg( 'AJAX Error', error_text, function () { } );     
+
+    });	
 });
 
+//function to load modal for messages #msgModal
+// 1. header 2. Message body, 3. on close callback function 
+showMsg = function (header, body, callback) {
+  $('#msgModal').modal({
+	    backdrop: false,
+	    show: false,
+	    keyboard: false
+	})
+    .find('.modal-header > h3').text(header).end()
+    .find('.modal-body').html(body).end()
+    .find('.callback-btn').off('click.callback')
+      .on('click.callback', callback).end()
+    .modal('show');
+};   
+
 function search_submit () {
 	url = 'index.php?rt=product/search';
 
@@ -114,23 +138,4 @@ function getURLVar(urlVarName) {
 	}
 
 	return urlVarValue;
-}
-
-jQuery(function($){
-    $('#footer').ajaxError(function(e, jqXHR, settings, exception){
-        var error_msg = $.parseJSON(jqXHR.responseText);
-        $('#ajax_error').remove();
-        var error_box = $('<div id="ajax_error"><a href="#TB_inline?height=115&width=300&inlineId=hiddenModalContent&modal=true" class="thickbox"></a></div>')
-            .css('display','none');
-        $('#footer').after(error_box);
-        var $dialog = $('<div id="hiddenModalContent"></div>')
-            .html('<div style="text-align: center;"><b>' + exception + '</b><br/><br/>' + error_msg.error + '<p><input type="button" onclick="tb_remove()" value="  Ok  "></p></div>')
-            .css({'display':'none'});
-        $('#ajax_error a').after($dialog);
-        tb_init('#ajax_error a.thickbox');
-        $('#ajax_error a').click();
-
-
-
-    });
-});
+}
diff --git a/public_html/storefront/view/default_html5/template/common/footer.tpl b/public_html/storefront/view/default_html5/template/common/footer.tpl
@@ -48,6 +48,15 @@
 	<a id="gotop" href="#">Back to top</a>
 </footer>
 
+<div id="msgModal" class="modal hide fade">
+  <div class="modal-header">
+    <button type="button" class="close callback-btn" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3></h3>
+  </div>
+  <div class="modal-body">
+  </div>
+</div>
+
 <!--
 AbanteCart is open source software and you are free to remove the Powered By AbanteCart if you want, but its generally accepted practise to make a small donatation.
 Please donate via PayPal to donate@abantecart.com