diff --git a/modules/qlohotelreview/controllers/front/default.php b/modules/qlohotelreview/controllers/front/default.php index d482a2764..487d86fc6 100644 --- a/modules/qlohotelreview/controllers/front/default.php +++ b/modules/qlohotelreview/controllers/front/default.php @@ -43,7 +43,7 @@ class QloHotelReviewDefaultModuleFrontController extends ModuleFrontController $maxImages = (int) Configuration::get('QHR_MAX_IMAGES_PER_REVIEW'); $approvalEnabled = (int) Configuration::get('QHR_ADMIN_APPROVAL_ENABLED'); - $status = 'ko'; + $status = false; $errors = array('by_key' => array(), 'general' => array()); $objModule = new QloHotelReview(); $objHotel = new HotelBranchInformation($idHotel); @@ -104,14 +104,14 @@ class QloHotelReviewDefaultModuleFrontController extends ModuleFrontController if ($maxImages) { $objHotelReview->saveReviewImages(); } - $status = 'ok'; + $status = true; } } else { - $status = 'ko'; + $status = false; $errors['general'][] = $objModule->l('Something went wrong.', 'default'); } } else { - $status = 'ko'; + $status = false; } if (is_array($errors['general']) && count($errors['general'])) { @@ -127,7 +127,7 @@ class QloHotelReviewDefaultModuleFrontController extends ModuleFrontController public function displayAjaxMarkReviewHelpful() { - $response = array('status' => 'ko'); + $response = array('status' => false); $idHotelReview = (int) Tools::getValue('id_hotel_review'); if (!$idHotelReview) { die(json_encode($response)); @@ -138,14 +138,14 @@ class QloHotelReviewDefaultModuleFrontController extends ModuleFrontController } if (QhrHotelReview::markHelpful($idHotelReview, $this->context->cookie->id_customer)) { - $response['status'] = 'ok'; + $response['status'] = true; die(json_encode($response)); } } public function displayAjaxReportAbuse() { - $response = array('status' => 'ko'); + $response = array('status' => false); $idHotelReview = (int) Tools::getValue('id_hotel_review'); if (!$idHotelReview) { die(json_encode($response)); @@ -156,14 +156,14 @@ class QloHotelReviewDefaultModuleFrontController extends ModuleFrontController } if (QhrHotelReview::reportAbuse($idHotelReview, $this->context->cookie->id_customer)) { - $response['status'] = 'ok'; + $response['status'] = true; die(json_encode($response)); } } public function displayAjaxGetReviews() { - $response = array('status' => 'ko'); + $response = array('status' => false); $idHotel = (int) Tools::getValue('id_hotel'); $sortBy = (int) Tools::getValue('sort_by'); $page = (int)Tools::getValue('page'); @@ -181,7 +181,7 @@ class QloHotelReviewDefaultModuleFrontController extends ModuleFrontController if (is_array($reviews) && count($reviews)) { $response['html'] = $this->renderReviews($reviews); - $response['status'] = 'ok'; + $response['status'] = true; $response['message'] = 'HTML_OK'; $response['has_next_page'] = (bool) $hasNextPage; } @@ -191,7 +191,7 @@ class QloHotelReviewDefaultModuleFrontController extends ModuleFrontController public function displayAjaxSortBy() { - $response = array('status' => 'ko'); + $response = array('status' => false); $idHotel = (int) Tools::getValue('id_hotel'); $sortBy = (int) Tools::getValue('sort_by'); $reviewsPerPage = (int) Configuration::get('QHR_REVIEWS_PER_PAGE'); @@ -208,7 +208,7 @@ class QloHotelReviewDefaultModuleFrontController extends ModuleFrontController if (is_array($reviews) && count($reviews)) { $response['html'] = $this->renderReviews($reviews); - $response['status'] = 'ok'; + $response['status'] = true; $response['message'] = 'HTML_OK'; $response['has_next_page'] = (bool) $hasNextPage; } diff --git a/modules/qlohotelreview/views/css/admin/hotel-review.css b/modules/qlohotelreview/views/css/admin/hotel-review.css index e629410cc..57dbc83c0 100644 --- a/modules/qlohotelreview/views/css/admin/hotel-review.css +++ b/modules/qlohotelreview/views/css/admin/hotel-review.css @@ -17,6 +17,10 @@ * @license LICENSE.txt */ +.rich-text { + white-space: break-spaces; +} + .image-row { padding-top: 10px; } diff --git a/modules/qlohotelreview/views/css/front/review-list.css b/modules/qlohotelreview/views/css/front/review-list.css index a41c17322..0e3806f0d 100644 --- a/modules/qlohotelreview/views/css/front/review-list.css +++ b/modules/qlohotelreview/views/css/front/review-list.css @@ -175,6 +175,7 @@ font-size: 14px; line-height: 24px; color: #333; + white-space: break-spaces; } #hotel-reviews .btn-helpful span { diff --git a/modules/qlohotelreview/views/css/front/review.css b/modules/qlohotelreview/views/css/front/review.css index d19060ebc..4f6e3d7d5 100644 --- a/modules/qlohotelreview/views/css/front/review.css +++ b/modules/qlohotelreview/views/css/front/review.css @@ -83,6 +83,11 @@ margin-left: 10px; } +#add-review-popup .review-actions-wrap .btn-review.disabled { + background-color: #1292FF; + border: 1px solid #1292FF; +} + #add-review-popup .image-input-btn { width: 100px; height: 100px; diff --git a/modules/qlohotelreview/views/js/front/review-list.js b/modules/qlohotelreview/views/js/front/review-list.js index 3936215c9..70d81538e 100644 --- a/modules/qlohotelreview/views/js/front/review-list.js +++ b/modules/qlohotelreview/views/js/front/review-list.js @@ -33,7 +33,7 @@ var QhrReview = { dataType: 'JSON', headers: { 'cache-control': 'no-cache' }, success: function(response) { - if (response.status == 'ok') { + if (response.status == true) { $(btnHelpful).fadeOut('slow', function() { $(btnHelpful).remove(); }) @@ -54,7 +54,7 @@ var QhrReview = { dataType: 'JSON', headers: { 'cache-control': 'no-cache' }, success: function(response) { - if (response.status == 'ok') { + if (response.status == true) { $(btnReportAbuse).fadeOut('slow', function() { $(btnReportAbuse).remove(); }) @@ -76,7 +76,7 @@ var QhrReview = { type: 'POST', headers: { 'cache-control': 'no-cache' }, success: function(response) { - if (response.status == 'ok' && response.message == 'HTML_OK') { + if (response.status == true && response.message == 'HTML_OK') { $('.review-list').animate({opacity: 0}, 250, 'linear', function() { $('.review-list').html(response.html); initRaty(qlo_hotel_review_js_vars.raty_img_path, '.review-list .raty'); @@ -108,7 +108,7 @@ var QhrReview = { type: 'POST', headers: { 'cache-control': 'no-cache' }, success: function(response) { - if (response.message == 'HTML_OK') { + if (response.status == true && response.message == 'HTML_OK') { $('.review-list').append(response.html); initRaty(qlo_hotel_review_js_vars.raty_img_path, '.review-list .raty'); diff --git a/modules/qlohotelreview/views/js/front/room-type-detail.js b/modules/qlohotelreview/views/js/front/room-type-detail.js index 165e9e48a..f46265cd4 100644 --- a/modules/qlohotelreview/views/js/front/room-type-detail.js +++ b/modules/qlohotelreview/views/js/front/room-type-detail.js @@ -17,7 +17,7 @@ * @license LICENSE.txt */ -function initRaty(path) { +function initRatyRoomTypeDetail(path) { $('.room_hotel_name_block .raty').html(''); // reset first to avoid star duplications $.extend($.raty, { path: path }); $('.room_hotel_name_block .raty').raty({readOnly: true, hints: null, noRatedMsg: '0'}); @@ -25,6 +25,6 @@ function initRaty(path) { $(document).ready(function () { if (typeof qlo_hotel_review_rtd_js_vars === 'object' && qlo_hotel_review_rtd_js_vars.raty_img_path) { - initRaty(qlo_hotel_review_rtd_js_vars.raty_img_path); + initRatyRoomTypeDetail(qlo_hotel_review_rtd_js_vars.raty_img_path); } }); diff --git a/modules/qlohotelreview/views/js/hook/review.js b/modules/qlohotelreview/views/js/hook/review.js index 7c3acf0e7..7d28459d0 100644 --- a/modules/qlohotelreview/views/js/hook/review.js +++ b/modules/qlohotelreview/views/js/hook/review.js @@ -36,6 +36,7 @@ var QhrReviewForm = { }, beforeSubmit: function() { QhrReviewForm.hideGeneralErrors(); + QhrReviewForm.disableSubmitButton(); }, submit: function() { QhrReviewForm.beforeSubmit(); @@ -51,7 +52,7 @@ var QhrReviewForm = { type: 'POST', success: function(response) { var jsonResponse = JSON.parse(response); - if (jsonResponse.status == 'ok') { + if (jsonResponse.status == true) { QhrReviewForm.close(); QhrReviewForm.showSuccessMessage(); QhrReviewForm.removeBtn(); @@ -63,7 +64,10 @@ var QhrReviewForm = { } else { QhrReviewForm.showGeneralErrors(jsonResponse.errors.general); } - } + }, + complete: function() { + QhrReviewForm.enableSubmitButton(); + }, }); }, showGeneralErrors: function(errors) { @@ -75,6 +79,12 @@ var QhrReviewForm = { $('#review-general-errors').html(''); }); }, + enableSubmitButton: function() { + $('#btn-submit-review').removeClass('disabled'); + }, + disableSubmitButton: function() { + $('#btn-submit-review').addClass('disabled'); + }, showSuccessMessage: function() { var href = ''; if (qlo_hotel_review_js_vars.admin_approval_enabled) { diff --git a/modules/qlohotelreview/views/templates/admin/hotel_review_hotel_review/helpers/view/_partials/review.tpl b/modules/qlohotelreview/views/templates/admin/hotel_review_hotel_review/helpers/view/_partials/review.tpl index 5614a8fe2..5605931bc 100644 --- a/modules/qlohotelreview/views/templates/admin/hotel_review_hotel_review/helpers/view/_partials/review.tpl +++ b/modules/qlohotelreview/views/templates/admin/hotel_review_hotel_review/helpers/view/_partials/review.tpl @@ -42,14 +42,14 @@
{$currentObject->subject}
+{$currentObject->subject}
{$currentObject->description}
+{$currentObject->description}