From fea6fa7191ce99a914f8548dd031d72b4d310cc4 Mon Sep 17 00:00:00 2001
From: leemyong pakvn <3759923+leemyongpakvn@users.noreply.github.com>
Date: Sat, 20 Jan 2024 18:21:19 +0700
Subject: [PATCH 1/6] make rating mandatory

---
 views/js/jquery.rating.plugin.js            | 1 +
 views/js/post-comment.js                    | 5 +++++
 views/templates/hook/post-comment-modal.tpl | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/views/js/jquery.rating.plugin.js b/views/js/jquery.rating.plugin.js
index b466e9fd..755dbdbc 100644
--- a/views/js/jquery.rating.plugin.js
+++ b/views/js/jquery.rating.plugin.js
@@ -96,6 +96,7 @@ jQuery.fn.rating = function(generalOptions) {
         newStar.on('click', function selectGrade() {
           var selectedGrade = $(this).data('grade');
           ratingInput.val(selectedGrade);
+          ratingChosen = true;
         });
         fullStars.append(newStar);
       }
diff --git a/views/js/post-comment.js b/views/js/post-comment.js
index 3601f882..26a28bbb 100644
--- a/views/js/post-comment.js
+++ b/views/js/post-comment.js
@@ -124,6 +124,11 @@ jQuery(document).ready(function () {
       }
     });
 
+    if (!ratingChosen) {
+      showPostErrorModal(productCommentRatingNotChosen);
+      isValid = false;
+    }
+
     return isValid;
   }
 
diff --git a/views/templates/hook/post-comment-modal.tpl b/views/templates/hook/post-comment-modal.tpl
index 81a75659..c559a594 100644
--- a/views/templates/hook/post-comment-modal.tpl
+++ b/views/templates/hook/post-comment-modal.tpl
@@ -25,6 +25,8 @@
 
 <script type="text/javascript">
   var productCommentPostErrorMessage = '{l s='Sorry, your review cannot be posted.' d='Modules.Productcomments.Shop' js=1}';
+  var productCommentRatingNotChosen = '{l s='Please choose a rating for your review.' d='Modules.Productcomments.Shop' js=1}';
+  var ratingChosen = false;
 </script>
 
 <div id="post-product-comment-modal" class="modal fade product-comment-modal" role="dialog" aria-hidden="true">

From 10ddd325eb3f7221221ff9fcd2746f9ab967235d Mon Sep 17 00:00:00 2001
From: leemyong pakvn <3759923+leemyongpakvn@users.noreply.github.com>
Date: Sun, 21 Jan 2024 07:42:14 +0700
Subject: [PATCH 2/6] put Mandatory message inside the current modal instead of
 a new modal

---
 views/css/productcomments.css               |  6 ++++++
 views/js/post-comment.js                    | 18 ++++++++++++------
 views/templates/hook/post-comment-modal.tpl |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/views/css/productcomments.css b/views/css/productcomments.css
index 106d2808..13e69982 100644
--- a/views/css/productcomments.css
+++ b/views/css/productcomments.css
@@ -291,6 +291,12 @@
   font-weight: bold;
 }
 
+#ratingNotChosen {
+  font-size: smaller;
+  color: #ff0000;
+  text-align: center;
+}
+
 #post-product-comment-form input.error,
 #post-product-comment-form textarea.error {
   background-color: #f2dede;
diff --git a/views/js/post-comment.js b/views/js/post-comment.js
index 26a28bbb..d9f76fdf 100644
--- a/views/js/post-comment.js
+++ b/views/js/post-comment.js
@@ -39,6 +39,10 @@ jQuery(document).ready(function () {
   const commentPostedModal = $('#product-comment-posted-modal');
   const commentPostErrorModal = $('#product-comment-post-error');
 
+  const criterionsList = $('#criterions_list');
+  criterionsList.append('<div id="ratingNotChosen">* ' + productCommentMandatoryMessage + '</div>');
+  $('#ratingNotChosen').hide();
+
   function showPostCommentModal() {
     commentPostedModal.modal('hide');
     commentPostErrorModal.modal('hide');
@@ -122,12 +126,14 @@ jQuery(document).ready(function () {
         $(fieldSelector).removeClass('error');
         $(fieldSelector).addClass('valid');
       }
-    });
-
-    if (!ratingChosen) {
-      showPostErrorModal(productCommentRatingNotChosen);
-      isValid = false;
-    }
+           
+      if (!ratingChosen) {
+        $('#ratingNotChosen').show();
+        isValid = false;
+      } else {
+        $('#ratingNotChosen').hide();
+      }
+    });  
 
     return isValid;
   }
diff --git a/views/templates/hook/post-comment-modal.tpl b/views/templates/hook/post-comment-modal.tpl
index c559a594..4c682ace 100644
--- a/views/templates/hook/post-comment-modal.tpl
+++ b/views/templates/hook/post-comment-modal.tpl
@@ -25,7 +25,7 @@
 
 <script type="text/javascript">
   var productCommentPostErrorMessage = '{l s='Sorry, your review cannot be posted.' d='Modules.Productcomments.Shop' js=1}';
-  var productCommentRatingNotChosen = '{l s='Please choose a rating for your review.' d='Modules.Productcomments.Shop' js=1}';
+  var productCommentMandatoryMessage = '{l s='Please choose a rating for your review.' d='Modules.Productcomments.Shop' js=1}';
   var ratingChosen = false;
 </script>
 

From dc9c3f3b5637254258c78a4bbdd61539feb65bcc Mon Sep 17 00:00:00 2001
From: leemyong pakvn <3759923+leemyongpakvn@users.noreply.github.com>
Date: Sun, 21 Jan 2024 11:20:25 +0700
Subject: [PATCH 3/6] unify

---
 views/js/post-comment.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/views/js/post-comment.js b/views/js/post-comment.js
index d9f76fdf..c0a14921 100644
--- a/views/js/post-comment.js
+++ b/views/js/post-comment.js
@@ -41,7 +41,8 @@ jQuery(document).ready(function () {
 
   const criterionsList = $('#criterions_list');
   criterionsList.append('<div id="ratingNotChosen">* ' + productCommentMandatoryMessage + '</div>');
-  $('#ratingNotChosen').hide();
+  const criterionsInfo = $('#ratingNotChosen');
+  criterionsInfo.hide();
 
   function showPostCommentModal() {
     commentPostedModal.modal('hide');
@@ -128,10 +129,10 @@ jQuery(document).ready(function () {
       }
            
       if (!ratingChosen) {
-        $('#ratingNotChosen').show();
+        criterionsInfo.show();
         isValid = false;
       } else {
-        $('#ratingNotChosen').hide();
+        criterionsInfo.hide();
       }
     });  
 

From 36d69ce5810fb64ba32bc035241af352a30f0919 Mon Sep 17 00:00:00 2001
From: leemyong pakvn <3759923+leemyongpakvn@users.noreply.github.com>
Date: Tue, 23 Jan 2024 21:39:42 +0700
Subject: [PATCH 4/6] tweak message color and alignment

---
 views/css/productcomments.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/css/productcomments.css b/views/css/productcomments.css
index 13e69982..d87f2dbe 100644
--- a/views/css/productcomments.css
+++ b/views/css/productcomments.css
@@ -293,8 +293,8 @@
 
 #ratingNotChosen {
   font-size: smaller;
-  color: #ff0000;
-  text-align: center;
+  color: #ab4746;
+  text-align: right;
 }
 
 #post-product-comment-form input.error,

From 415fee76c218b8ca39ef5a3164110d8be786ec5d Mon Sep 17 00:00:00 2001
From: leemyong pakvn <3759923+leemyongpakvn@users.noreply.github.com>
Date: Mon, 29 Jan 2024 22:36:54 +0700
Subject: [PATCH 5/6] hide Mandatory message at each showPostCommentModal call

---
 views/js/post-comment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/js/post-comment.js b/views/js/post-comment.js
index c0a14921..9941d5bc 100644
--- a/views/js/post-comment.js
+++ b/views/js/post-comment.js
@@ -41,13 +41,13 @@ jQuery(document).ready(function () {
 
   const criterionsList = $('#criterions_list');
   criterionsList.append('<div id="ratingNotChosen">* ' + productCommentMandatoryMessage + '</div>');
-  const criterionsInfo = $('#ratingNotChosen');
-  criterionsInfo.hide();
+  const criterionsInfo = $('#ratingNotChosen');  
 
   function showPostCommentModal() {
     commentPostedModal.modal('hide');
     commentPostErrorModal.modal('hide');
     postCommentModal.modal('show');
+    criterionsInfo.hide();
   }
 
   function showCommentPostedModal() {

From 357a3f6f4ec38a1bd6f8d3255f1c9a200b030aa5 Mon Sep 17 00:00:00 2001
From: leemyong pakvn <3759923+leemyongpakvn@users.noreply.github.com>
Date: Mon, 5 Feb 2024 20:47:52 +0700
Subject: [PATCH 6/6] forced to chose rating in any new review

---
 views/js/post-comment.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/js/post-comment.js b/views/js/post-comment.js
index 9941d5bc..cf593b54 100644
--- a/views/js/post-comment.js
+++ b/views/js/post-comment.js
@@ -47,6 +47,7 @@ jQuery(document).ready(function () {
     commentPostedModal.modal('hide');
     commentPostErrorModal.modal('hide');
     postCommentModal.modal('show');
+    ratingChosen = false;
     criterionsInfo.hide();
   }