From c2ce27fd6a48f0a55a29fd0c9608d143dfa698cc Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Fri, 28 Apr 2023 11:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20VISA=20FREE=20=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=EF=BC=9B=E5=A2=9E=E5=8A=A0=20GH=E3=80=81AH=20?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php       | 24 ++++++++
 .../views/mobile_first/ah-feedback-newest.php | 61 +++++++++++++++++++
 .../mobile_first/ch-visa-free-tester.php      |  6 +-
 .../views/mobile_first/gh-feedback-newest.php | 61 +++++++++++++++++++
 4 files changed, 151 insertions(+), 1 deletion(-)
 create mode 100644 application/views/mobile_first/ah-feedback-newest.php
 create mode 100644 application/views/mobile_first/gh-feedback-newest.php

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 5708da6b..1b56f46a 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1153,6 +1153,18 @@ class Information extends CI_Controller
           $information->ic_content = str_replace('<!--@TOUR-FORM-TAG@-->', $tour_form_content, $information->ic_content);
         }
 
+        $feedback_newest = $this->Feedback_model->get_feedback_newest();
+        $feedback_newest_content = $this->load->view(
+            $template_path . '-feedback-newest',
+            array('feedback_list' => $feedback_newest),
+            true
+        );
+        $information->ic_content = str_replace(
+            '<!--@NEWEST_FEEDBACK@-->',
+            $feedback_newest_content,
+            $information->ic_content
+        );
+
         if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速
             $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css'));
         } else {
@@ -1420,6 +1432,18 @@ class Information extends CI_Controller
             }
         }
 
+        $feedback_newest = $this->Feedback_model->get_feedback_newest();
+        $feedback_newest_content = $this->load->view(
+            $template_path . '-feedback-newest',
+            array('feedback_list' => $feedback_newest),
+            true
+        );
+        $information->ic_content = str_replace(
+            '<!--@NEWEST_FEEDBACK@-->',
+            $feedback_newest_content,
+            $information->ic_content
+        );
+
         //主样式表，内联模式
         if (is_file('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速
             $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css'));
diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php
new file mode 100644
index 00000000..a8660595
--- /dev/null
+++ b/application/views/mobile_first/ah-feedback-newest.php
@@ -0,0 +1,61 @@
+
+<div style="text-align:center;font-weight: 600; font-size:18px;  margin-top: 50px; font-style: italic;" class="visible-xs">
+  <img src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="
+      margin: 0 auto 10px auto;
+      display: block;
+      width: 200px;
+  ">
+  Rated 4.9 out of 5 |
+  Excellent
+  <br>
+  Based on 10,000+ reviews
+  
+</div>
+<p class="visible-xs" style="margin-bottom: 0; ">
+  <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png"
+    style="width: 180px; margin: 0 auto 10px auto">
+</p>
+<div class="table-responsive">
+  <table>
+    <tbody>
+      <tr>
+        <td class="hidden-xs">
+          <div class="feedback_logo">
+
+
+            <img src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="
+    margin: 0 auto 10px auto;
+    display: block;
+    width: 200px;
+">
+            <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;">Rated 4.9 out of 5 |
+              Excellent<br>Based on 10,000+ reviews</div>
+            <img alt="Tour Review" class="img-responsive"
+              src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px;
+              display: block;
+              margin: 20px auto 0 auto;">
+          </div>
+        </td>
+        <?php foreach ($feedback_list as $index => $feedback) {?>
+        <td>
+          <div class="tour_feedback">
+            <div class="feedback_content">
+              <strong>
+                <?php echo $feedback['title'] ?>
+              </strong>
+              <p>
+                <?php echo $feedback['content'] ?>
+              </p>
+              <a href="<?php echo $feedback['url'] ?>" target="_blank">More</a>
+            </div>
+            <div class="customer_name">
+              <?php echo $feedback['customer'] ?>,
+              <?php echo $feedback['createdOn'] ?>
+            </div>
+          </div>
+        </td>
+        <?php }?>
+      </tr>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file
diff --git a/application/views/mobile_first/ch-visa-free-tester.php b/application/views/mobile_first/ch-visa-free-tester.php
index 3e505bad..2bff472e 100644
--- a/application/views/mobile_first/ch-visa-free-tester.php
+++ b/application/views/mobile_first/ch-visa-free-tester.php
@@ -1153,15 +1153,19 @@ ready(el => {
     const selectedOption = airportOrRailwayStation.options[airportOrRailwayStation.selectedIndex];
     const indexOf72 = selectedOption.getAttribute('data-hour').indexOf('72');
     const indexOf144 = selectedOption.getAttribute('data-hour').indexOf('144');
-
+    
     if (diffInDays < 1 || diffInDays > 2 || indexOf72 == -1) {
       visa72hours = false;
       error_72hours.show();
+    } else {
+      qualify_72hours.show();
     }
 
     if (diffInDays < 1 || diffInDays > 7 || indexOf144 == -1) {
       visa144hours = false;
       error_72hours.show();
+    } else {
+      qualify_144hours.show();
     }
     
     validateSuccess = (visa144hours || visa72hours) && qualify2China && thirdCountry;
diff --git a/application/views/mobile_first/gh-feedback-newest.php b/application/views/mobile_first/gh-feedback-newest.php
new file mode 100644
index 00000000..a8660595
--- /dev/null
+++ b/application/views/mobile_first/gh-feedback-newest.php
@@ -0,0 +1,61 @@
+
+<div style="text-align:center;font-weight: 600; font-size:18px;  margin-top: 50px; font-style: italic;" class="visible-xs">
+  <img src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="
+      margin: 0 auto 10px auto;
+      display: block;
+      width: 200px;
+  ">
+  Rated 4.9 out of 5 |
+  Excellent
+  <br>
+  Based on 10,000+ reviews
+  
+</div>
+<p class="visible-xs" style="margin-bottom: 0; ">
+  <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png"
+    style="width: 180px; margin: 0 auto 10px auto">
+</p>
+<div class="table-responsive">
+  <table>
+    <tbody>
+      <tr>
+        <td class="hidden-xs">
+          <div class="feedback_logo">
+
+
+            <img src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="
+    margin: 0 auto 10px auto;
+    display: block;
+    width: 200px;
+">
+            <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;">Rated 4.9 out of 5 |
+              Excellent<br>Based on 10,000+ reviews</div>
+            <img alt="Tour Review" class="img-responsive"
+              src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px;
+              display: block;
+              margin: 20px auto 0 auto;">
+          </div>
+        </td>
+        <?php foreach ($feedback_list as $index => $feedback) {?>
+        <td>
+          <div class="tour_feedback">
+            <div class="feedback_content">
+              <strong>
+                <?php echo $feedback['title'] ?>
+              </strong>
+              <p>
+                <?php echo $feedback['content'] ?>
+              </p>
+              <a href="<?php echo $feedback['url'] ?>" target="_blank">More</a>
+            </div>
+            <div class="customer_name">
+              <?php echo $feedback['customer'] ?>,
+              <?php echo $feedback['createdOn'] ?>
+            </div>
+          </div>
+        </td>
+        <?php }?>
+      </tr>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file