From 793e15e8c39a6c083b6e6f79446b0835a28f6ff1 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 21 Mar 2024 15:54:29 +0530 Subject: [PATCH 1/3] Fixed incorrect 'No internet error.' message on Room type detail page when adding a room to cart. --- themes/hotel-reservation-theme/js/product.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/themes/hotel-reservation-theme/js/product.js b/themes/hotel-reservation-theme/js/product.js index 90fe2eb4e..2baf58348 100644 --- a/themes/hotel-reservation-theme/js/product.js +++ b/themes/hotel-reservation-theme/js/product.js @@ -1466,12 +1466,10 @@ var BookingForm = { } } }, - error: function(jqXHR) { - if (jqXHR.readyState == 0) { + complete: function(jqXHR, textStatus) { + if (textStatus == 'error') { showErrorMessage(no_internet_txt); } - }, - complete: function() { $('.book_now_submit').prop('disabled', false).find('span:not(#booking_action_loader)').show(); $('#booking_action_block').find('#booking_action_loader').removeClass('active'); } From f74e4b665adca988ce26ae4d0ed77ba5ede50197 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 2 Apr 2024 13:16:04 +0530 Subject: [PATCH 2/3] Use 'online' and 'offline' events to display error messages --- modules/blockcart/ajax-cart.js | 8 ++++---- themes/hotel-reservation-theme/js/global.js | 9 +++++++++ .../js/modules/blockcart/ajax-cart.js | 8 ++++---- themes/hotel-reservation-theme/js/product.js | 6 ++++-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js index 7d81275c0..c1cb4b1e7 100644 --- a/modules/blockcart/ajax-cart.js +++ b/modules/blockcart/ajax-cart.js @@ -482,7 +482,7 @@ var ajaxCart = { }, error: function(XMLHttpRequest, textStatus, errorThrown) { - if (XMLHttpRequest.readyState == 0) { + if (!onlineFlag) { showErrorMessage(no_internet_txt); } else { var error = "Impossible to add the room to the cart.
textStatus: '" + textStatus + "'
errorThrown: '" + errorThrown + "'
responseText:
" + XMLHttpRequest.responseText; @@ -620,7 +620,7 @@ var ajaxCart = { }, error: function(XMLHttpRequest, textStatus, errorThrown) { - if (XMLHttpRequest.readyState == 0) { + if (!onlineFlag) { showErrorMessage(no_internet_txt); } else { var error = "Impossible to add the room to the cart.
textStatus: '" + textStatus + "'
errorThrown: '" + errorThrown + "'
responseText:
" + XMLHttpRequest.responseText; @@ -694,8 +694,8 @@ var ajaxCart = { deleteProductFromSummary(idProduct + '_' + idCombination + '_' + customizationId + '_' + idAddressDelivery); }*/ }, - error: function(jqXHR) { - if (jqXHR.readyState == 0) { + error: function() { + if (!onlineFlag) { showErrorMessage(no_internet_txt); } else { var error = 'ERROR: unable to delete the product'; diff --git a/themes/hotel-reservation-theme/js/global.js b/themes/hotel-reservation-theme/js/global.js index d29ce5d2f..2e7dcafd1 100644 --- a/themes/hotel-reservation-theme/js/global.js +++ b/themes/hotel-reservation-theme/js/global.js @@ -24,6 +24,7 @@ */ //global variables var responsiveflag = false; +var onlineFlag = true; @@ -494,3 +495,11 @@ function showErrorMessage(msg) { function showNoticeMessage(msg) { $.growl.notice({ title: "", message:msg}); } + +window.addEventListener('online', function () { + onlineFlag = true; +}); + +window.addEventListener('offline', function () { + onlineFlag = false; +}); diff --git a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js index 7d81275c0..c1cb4b1e7 100644 --- a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js +++ b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js @@ -482,7 +482,7 @@ var ajaxCart = { }, error: function(XMLHttpRequest, textStatus, errorThrown) { - if (XMLHttpRequest.readyState == 0) { + if (!onlineFlag) { showErrorMessage(no_internet_txt); } else { var error = "Impossible to add the room to the cart.
textStatus: '" + textStatus + "'
errorThrown: '" + errorThrown + "'
responseText:
" + XMLHttpRequest.responseText; @@ -620,7 +620,7 @@ var ajaxCart = { }, error: function(XMLHttpRequest, textStatus, errorThrown) { - if (XMLHttpRequest.readyState == 0) { + if (!onlineFlag) { showErrorMessage(no_internet_txt); } else { var error = "Impossible to add the room to the cart.
textStatus: '" + textStatus + "'
errorThrown: '" + errorThrown + "'
responseText:
" + XMLHttpRequest.responseText; @@ -694,8 +694,8 @@ var ajaxCart = { deleteProductFromSummary(idProduct + '_' + idCombination + '_' + customizationId + '_' + idAddressDelivery); }*/ }, - error: function(jqXHR) { - if (jqXHR.readyState == 0) { + error: function() { + if (!onlineFlag) { showErrorMessage(no_internet_txt); } else { var error = 'ERROR: unable to delete the product'; diff --git a/themes/hotel-reservation-theme/js/product.js b/themes/hotel-reservation-theme/js/product.js index 2baf58348..1ca00333f 100644 --- a/themes/hotel-reservation-theme/js/product.js +++ b/themes/hotel-reservation-theme/js/product.js @@ -1466,10 +1466,12 @@ var BookingForm = { } } }, - complete: function(jqXHR, textStatus) { - if (textStatus == 'error') { + error: function() { + if (!onlineFlag) { showErrorMessage(no_internet_txt); } + }, + complete: function() { $('.book_now_submit').prop('disabled', false).find('span:not(#booking_action_loader)').show(); $('#booking_action_block').find('#booking_action_loader').removeClass('active'); } From 561a55d075cbbc2f3d69e55767e605da881aa33a Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 2 Apr 2024 14:57:25 +0530 Subject: [PATCH 3/3] Fix for newsletter --- modules/blocknewsletter/blocknewsletter.js | 4 ++-- .../js/modules/blocknewsletter/blocknewsletter.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/blocknewsletter/blocknewsletter.js b/modules/blocknewsletter/blocknewsletter.js index 488dc989a..90caf5352 100644 --- a/modules/blocknewsletter/blocknewsletter.js +++ b/modules/blocknewsletter/blocknewsletter.js @@ -17,8 +17,8 @@ $(document).on('click', '#blocknewsletter .newsletter-btn', function (e) { let messageBlock = $('#blocknewsletter .message-block'); $(messageBlock).html(response.message_html).stop(true, true).fadeIn('fast'); }, - error: function (jqXHR) { - if (jqXHR.readyState == 0) { + error: function () { + if (!onlineFlag) { showErrorMessage(no_internet_txt); } }, diff --git a/themes/hotel-reservation-theme/js/modules/blocknewsletter/blocknewsletter.js b/themes/hotel-reservation-theme/js/modules/blocknewsletter/blocknewsletter.js index 8635bd925..235af017e 100644 --- a/themes/hotel-reservation-theme/js/modules/blocknewsletter/blocknewsletter.js +++ b/themes/hotel-reservation-theme/js/modules/blocknewsletter/blocknewsletter.js @@ -42,8 +42,8 @@ $(document).on('click', '#blocknewsletter .newsletter-btn', function (e) { let messageBlock = $('#blocknewsletter .message-block'); $(messageBlock).html(response.message_html).stop(true, true).fadeIn('fast'); }, - error: function (jqXHR) { - if (jqXHR.readyState == 0) { + error: function () { + if (!onlineFlag) { showErrorMessage(no_internet_txt); } },