Merge branch 'master' of github.com:hainatravel/information-system

.github/workflows/Deploy CN.yml

@@ -0,0 +1,37 @@
+#  .
+name: 🚀 Deploy INFO-SYS
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+jobs:
+  gh-win-cn-all-deploy:
+    name: 🎉 Deploy InfoSys to CN
+    runs-on: ubuntu-latest
+    steps:
+    - name: 🚚 Get latest code
+      uses: actions/checkout@v3
+
+    - name: 📂 Sync files
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      with:
+        server: ${{ secrets.CN_FTP_SERVER }}
+        username: ${{ secrets.CN_FTP_USER }}
+        password: ${{ secrets.CN_FTP_PASSWORD }}
+        port: ${{ secrets.CN_FTP_PORT }}
+        local-dir: ./
+        server-dir: /wwwroot/origin-cht.mycht.cn/
+        # dry-run: true
+        # log-level: verbose
+        exclude: |
+          **/.git*
+          **/.git*/**
+          **/node_modules/**
+          document/**
+          download_statement/**
+          sample/**
+          **/logs/**
+          **/web.config
+          **/author/document/**
+          *.exe
+          *.docx

.github/workflows/Deploy.yml

@@ -0,0 +1,94 @@
+name: 🚀 Deploy INFO-SYS
+
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+
+jobs:
+  gh-win-us-deploy:
+    name: 🎉 Deploy InfoSys to US
+    runs-on: ubuntu-latest
+    steps:
+    - name: 🚚 Get latest code
+      uses: actions/checkout@v3
+
+    - name: 📂 Sync files to CHT
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      with:
+        server: ${{ secrets.US_FTP_SERVER }}
+        username: ${{ secrets.US_FTP_USER }}
+        password: ${{ secrets.US_FTP_PASSWORD }}
+        port: ${{ secrets.US_FTP_PORT }}
+        local-dir: ./
+        server-dir: /information-system/
+        # dry-run: true
+        exclude: |
+          **/.git*
+          **/.git*/**
+          **/node_modules/**
+          document/**
+          download_statement/**
+          sample/**
+          **/logs/**
+          **/web.config
+          **/author/document/**
+          *.exe
+          *.docx
+          .ftp-deploy-sync-state.json
+    - name: 📂 Sync files to CT
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      with:
+        server: ${{ secrets.US_FTP_SERVER }}
+        username: ${{ secrets.US_FTP_USER }}
+        password: ${{ secrets.US_FTP_PASSWORD }}
+        port: ${{ secrets.US_FTP_PORT }}
+        local-dir: ./
+        server-dir: /origin-ct.mycht.cn/
+        # dry-run: true
+        exclude: |
+          **/.git*
+          **/.git*/**
+          **/node_modules/**
+          document/**
+          download_statement/**
+          sample/**
+          **/logs/**
+          **/web.config
+          **/author/document/**
+          *.exe
+          *.docx
+          .ftp-deploy-sync-state.json
+
+  gh-win-cn-deploy:
+    needs: gh-win-us-deploy
+    name: 🎉 Deploy InfoSys to CN
+    runs-on: ubuntu-latest
+    steps:
+    - name: 🚚 Get latest code
+      uses: actions/checkout@v3
+
+    - name: 📂 Sync files to CHT
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      with:
+        server: ${{ secrets.CN_FTP_SERVER }}
+        username: ${{ secrets.CN_FTP_USER }}
+        password: ${{ secrets.CN_FTP_PASSWORD }}
+        port: ${{ secrets.CN_FTP_PORT }}
+        local-dir: ./
+        server-dir: /wwwroot/origin-cht.mycht.cn/
+        # dry-run: true
+        # log-level: verbose
+        exclude: |
+          **/.git*
+          **/.git*/**
+          **/node_modules/**
+          document/**
+          download_statement/**
+          sample/**
+          **/logs/**
+          **/web.config
+          **/author/document/**
+          *.exe
+          *.docx
+          .ftp-deploy-sync-state.json

.gitignore

@@ -1,5 +1,7 @@
 .idea
 .phpintel
+.*.json.bak
+.ftp-deploy-sync-state.json
 .svn/*
 */logs/log*
 /web.config
@@ -14,3 +16,4 @@
 /application/config/database.php
 
 
+

README.md

@@ -2,3 +2,5 @@
 
 网前订单数量查看 https://cht.mycht.cn/info.php/look_order/status
 商务加传统订单超过500页面报错，可用于监控
+
+test

application/cache/.htaccess

@@ -1 +0,0 @@
-deny from all

application/cache/index.html

@@ -1,10 +0,0 @@
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>

application/controllers/information.php

@@ -311,6 +311,8 @@ class Information extends CI_Controller
 
         //获取移动优先的模板，如果有的话
         //增加判断站点，每个站点需要读取的模板不一样。 20210311 zp
+        //取消预览，严重影响速度 2023-08-15 ycc
+        /*
         if (is_mobile_first()) {
             $mobile_first_template_path = 'mobile_first/' . $this->config->item('site_code');
             if (is_file(APPPATH . 'views/' . $mobile_first_template_path . EXT)) {
@@ -326,9 +328,10 @@ class Information extends CI_Controller
                 $data['mobile_first_template'] = '没有找到移动模板';
             }
         }
+        */
 
-        //CT判断是否生成静态文件
-        if ($this->config->item("site_code") == "chinatravel") {
+        //判断是否生成静态文件
+        if (is_mobile_first()) {
             //查找是否有静态文件
             if ($this->html_file_helper('find', $data['information']->ic_url)) {
                 $data['has_html_file'] = true;
@@ -547,7 +550,7 @@ class Information extends CI_Controller
             echo json_encode(array('name' => 'yes', 'data' => '更新成功!'));
             return true;
         } else {
-            echo json_encode(array('name' => 'no', 'data' => '没有发布静态页面'));
+            echo json_encode(array('name' => 'no', 'data' => '没有发布静态页面: ' . $information->ic_url));
             return false;
         }
     }
@@ -737,15 +740,15 @@ class Information extends CI_Controller
         //火车票搜索框添加 -- zp
         if ($information->is_parent_id == "278008234") {
             //本地测试的火车父类ID为：278035939 。网前为：278008234
-            $meta_train_city =  get_meta($information->ic_id, 'meta_train_city'); //默认的出发及目的地城市 ， beijing|shanghai
-            $data_TrainCity=array();
-            $data_TrainCity["from"]="";
-            $data_TrainCity["to"]="";
-            if (!empty($meta_train_city)){
-                if (strpos($meta_train_city,'|')!==false){
-                    $arrTrainCity = explode('|',$meta_train_city);
-                    $data_TrainCity["from"]  = $arrTrainCity[0];
-                    $data_TrainCity["to"]  = $arrTrainCity[1];
+            $meta_train_city = get_meta($information->ic_id, 'meta_train_city'); //默认的出发及目的地城市 ， beijing|shanghai
+            $data_TrainCity = array();
+            $data_TrainCity["from"] = "";
+            $data_TrainCity["to"] = "";
+            if (!empty($meta_train_city)) {
+                if (strpos($meta_train_city, '|') !== false) {
+                    $arrTrainCity = explode('|', $meta_train_city);
+                    $data_TrainCity["from"] = $arrTrainCity[0];
+                    $data_TrainCity["to"] = $arrTrainCity[1];
                 }
             }
 
@@ -921,6 +924,46 @@ class Information extends CI_Controller
         if (!empty($template_recommand['Tips Right'])) {
             $template = str_replace('<!--@TIPS-RIGHT@-->', "<div class='right_tour'>" . $template_recommand['Tips Right']->it_content . "</div>", $template);
         }
+
+        // /day-tours/(278008224) 节点不使用推荐信息
+        if ($information->is_parent_id == '278008224') {
+        } else {
+          // 右侧列表广告
+          $tips_right_a = [];
+          $tips_right_b = [];
+          $tips_right_c = [];
+          for ($i = 1; $i <= 12; $i++) {
+              $key = 'List Tips Right A_' . $i;
+              if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) {
+                  $tips_right_a[] = $recommand_information[$key];
+              }
+          }
+          for ($i = 1; $i <= 12; $i++) {
+              $key = 'List Tips Right B_' . $i;
+              if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) {
+                  $tips_right_b[] = $recommand_information[$key];
+              }
+          }
+          for ($i = 1; $i <= 12; $i++) {
+              $key = 'List Tips Right C_' . $i;
+              if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) {
+                  $tips_right_c[] = $recommand_information[$key];
+              }
+          }
+
+          $tips_right_list_content = $this->load->view(
+              'mobile_first/ch-tips-right-list',
+              array(
+                  'tips_right_a' => $tips_right_a,
+                  'tips_right_b' => $tips_right_b,
+                  'tips_right_c' => $tips_right_c
+              ),
+              true
+          );
+
+          $template = str_replace('<!--@TIPS-RIGHT-LIST@-->', $tips_right_list_content, $template);            
+        }
+
         //文中的信息推荐
         if (strpos($information->ic_content, '<!--@Content-Recommends-Article@-->') !== false) {
             $information->ic_content = str_replace('<!--@Content-Recommends-Article@-->', $this->load->view($template_path . '-recommends-article', array('recommands' => $template_recommand), true), $information->ic_content);
@@ -979,7 +1022,9 @@ class Information extends CI_Controller
             if (!empty($meta_addon_picture_url)) {
                 $template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner"><a href="' . $meta_addon_picture_url . '"> <img class="img-responsive" alt="' . $information->ic_title . '" src="' . $meta_addon_picture . '"></a></div>', $template);
             } else {
-                $template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner"><img class="img-responsive" alt="' . $information->ic_title . '" src="' . $meta_addon_picture . '">' . $template_TrainSearch . '</div>', $template);
+                $template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner"><img class="img-responsive" alt="' . $information->ic_title . '" src="' . $meta_addon_picture . '"><div class="ta_tag">
+            <img src="https://data.chinahighlights.com/image/forms/ch-2023-trip-advisor-excellent-certificate.png" style="width: 120px !important;height: auto;" width="208" height="236">
+        </div>' . $template_TrainSearch . '</div>', $template);
             }
         }
         //顶部视频
@@ -1001,7 +1046,8 @@ class Information extends CI_Controller
             $template = str_replace(
                 '<!--@CHINA-TRAINS-CSS@-->',
                 '<link href="https://proxy-data.chinahighlights.com/css/china-trains.css" rel="stylesheet">',
-                $template);
+                $template
+            );
         }
         //额外样式
         $meta_addon_css = get_meta($information->ic_id, 'meta_addon_css');
@@ -1435,6 +1481,40 @@ class Information extends CI_Controller
         if (!empty($template_recommand['Tips Right'])) {
             $template = str_replace('<!--@TIPS-RIGHT@-->', "<div class='right_tour'><div class='ah_inforight'>" . $template_recommand['Tips Right']->it_content . "</div></div>", $template);
         }
+        // 右侧列表广告
+        $tips_right_a = [];
+        $tips_right_b = [];
+        $tips_right_c = [];
+        for ($i = 1; $i <= 12; $i++) {
+            $key = 'List Tips Right A_' . $i;
+            if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) {
+                $tips_right_a[] = $recommand_information[$key];
+            }
+        }
+        for ($i = 1; $i <= 12; $i++) {
+            $key = 'List Tips Right B_' . $i;
+            if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) {
+                $tips_right_b[] = $recommand_information[$key];
+            }
+        }
+        for ($i = 1; $i <= 12; $i++) {
+            $key = 'List Tips Right C_' . $i;
+            if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) {
+                $tips_right_c[] = $recommand_information[$key];
+            }
+        }
+
+        $tips_right_list_content = $this->load->view(
+            'mobile_first/gh-tips-right-list',
+            array(
+                'tips_right_a' => $tips_right_a,
+                'tips_right_b' => $tips_right_b,
+                'tips_right_c' => $tips_right_c
+            ),
+            true
+        );
+
+        $template = str_replace('<!--@TIPS-RIGHT-LIST@-->', $tips_right_list_content, $template);
         //文中的信息推荐
         if (strpos($information->ic_content, '<!--@Content-Recommends-Article@-->') !== false) {
             // $information->ic_content = str_replace('<!--@Content-Recommends-Article@-->', $this->load->view($template_path . '-recommends-article', array('recommands' => $template_recommand), TRUE), $information->ic_content);

application/models/infoauthors_model.php

@@ -12,7 +12,7 @@ class Infoauthors_model extends CI_Model
     function __construct()
     {
         parent::__construct();
-        $this->HT = $this->load->database('HT', TRUE);
+        $this->HT = $this->load->database('INFORMATION', TRUE);
     }
 	
 	function init()

application/models/recommends_and_tips_model.php

@@ -6,7 +6,7 @@ class recommends_and_tips_model extends CI_Model
     function __construct()
     {
         parent::__construct();
-        $this->HT = $this->load->database('HT', TRUE);
+        $this->HT = $this->load->database('INFORMATION', TRUE);
     }
 
 

application/third_party/wwwlog/controllers/index.php

@@ -13,25 +13,44 @@ class Index extends CI_Controller
     //private $logstore = 'globalhoghlights';
     private $token = "";
     private $Log_Client;
-    private $logstore = array('cht' => 'globalhoghlights'
-        , 'ah' => 'asiahighlights'
-        , 'gh' => 'globalhighlights'
-        , 'ct' => 'chinatravel'
-        , 'yz' => 'yangtzeriver'
-        , 'gl' => 'guilinchina'
-        , 'sht' => 'shanghaihighlights'
-        , 'gm' => 'chinarundreisen'
-        , 'gmhw' => 'chinarundreisen'
-        , 'jp' => 'arachina'
-        , 'jphw' => 'arachina'
-        , 'ru' => 'chinahighlights_ru'
-        , 'ruhw' => 'chinahighlights_ru'
-        , 'it' => 'viaggio-in-cina'
-        , 'ithw' => 'viaggio-in-cina'
-        , 'vac' => 'viaje-a-china'
-        , 'vachw' => 'viaje-a-china'
-        , 'vc' => 'voyageschine'
-        , 'vchw' => 'voyageschine',
+    private $logstore = array(
+        'cht' => 'globalhoghlights'
+        ,
+        'ah' => 'asiahighlights'
+        ,
+        'gh' => 'globalhighlights'
+        ,
+        'ct' => 'chinatravel'
+        ,
+        'yz' => 'yangtzeriver'
+        ,
+        'gl' => 'guilinchina'
+        ,
+        'sht' => 'shanghaihighlights'
+        ,
+        'gm' => 'chinarundreisen'
+        ,
+        'gmhw' => 'chinarundreisen'
+        ,
+        'jp' => 'arachina'
+        ,
+        'jphw' => 'arachina'
+        ,
+        'ru' => 'chinahighlights_ru'
+        ,
+        'ruhw' => 'chinahighlights_ru'
+        ,
+        'it' => 'viaggio-in-cina'
+        ,
+        'ithw' => 'viaggio-in-cina'
+        ,
+        'vac' => 'viaje-a-china'
+        ,
+        'vachw' => 'viaje-a-china'
+        ,
+        'vc' => 'voyageschine'
+        ,
+        'vchw' => 'voyageschine',
     ); //站点日志存储库，每个网站对应一个
 
     public function __construct()
@@ -46,11 +65,16 @@ class Index extends CI_Controller
     {
         $data = array();
         $orders = $this->wwwlogs_model->get_update_list(10);
+        // print_r($orders);
         if ($orders) {
             foreach ($orders as $item) {
                 $site_code = strtolower($item->COLI_WebCode);
                 if (in_array($site_code, array('gm', 'gmhw', 'jp', 'jphw', 'ru', 'ruhw', 'it', 'ithw', 'vac', 'vachw', 'vc', 'vchw'))) {
-                    $this->orders_view_path_int($item->COLI_SN, $site_code, $item->COLI_SenderIP, 0, $item->COLI_OrderDetailText);
+                    try {
+                        $this->orders_view_path_int($item->COLI_SN, $site_code, $item->COLI_SenderIP, 0, $item->COLI_OrderDetailText);
+                    } catch (Exception $err) {
+                        print_r($err);
+                    }
                 } else {
                     $this->orders_view_path($item->COLI_SN, $site_code, $item->COLI_SenderIP);
                 }

application/views/mobile_first/ah-feedback-list.php

@@ -1,20 +1,18 @@
 
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;">
-  98.8% positive customer reviews among 10,000+
-  <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
-  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
-    </div>
-  </div>
+<h2 style="
+text-align: center; margin-bottom: 0;
+"><em style="color: #ad1818;">98.8%</em> Positive Customer reviews among 10,000+</h2>
+<div class="visible-xs" style="margin: 0 20px; ">
+<img class="img-responsive" height="69" src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" style="float: left; width: 150px; " width="175">
+<img height="40" src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" style="width: 120px; height: auto; " width="211">
+</div>
 <div class="table-responsive">
   <table>
     <tbody>
       <tr>
         <td class="hidden-xs">
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
-            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 25px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
-            <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
-            
-            </div>
+          <div class="feedback_logo">
+            <img  class="img-responsive" height="69" src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" style="margin: 0px auto; " width="175"> <img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" style="width: 170px; display: block; margin: 10px auto 0px; " width="1133"></div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>
         <td>

application/views/mobile_first/ah-feedback-newest.php

@@ -1,21 +1,19 @@
 
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;">
-  98.8% positive customer reviews among 10,000+
-  <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
-  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
-    </div>
-  </div>
+<h2 style="
+text-align: center; margin-bottom: 0;
+"><em style="color: #ad1818;">98.8%</em> Positive Customer reviews among 10,000+</h2>
+<div class="visible-xs" style="margin: 0 20px; ">
+<img class="img-responsive" height="69" src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" style="float: left; width: 150px; " width="175">
+<img height="40" src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" style="width: 120px; height: auto; " width="211">
+</div>
 
 <div class="table-responsive">
   <table>
     <tbody>
       <tr>
         <td class="hidden-xs">
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
-            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 25px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
-            <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
-            
-            </div>
+          <div class="feedback_logo">
+            <img  class="img-responsive" height="69" src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" style="margin: 0px auto; " width="175"> <img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" style="width: 170px; display: block; margin: 10px auto 0px; " width="1133"></div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>
         <td>

application/views/mobile_first/ah-h1.php

@@ -13,7 +13,7 @@
                 <a href="<?php echo $item['ic_url'] ?>" data-index="<?php echo $index ?>" data-is-id="<?php echo $item['is_id'] ?>"><?php echo $item['ic_url_title'] ?></a>
                 <?php }?>
                 <div class="top_banner_tp">
-<img src="https://data.asiahighlights.com/image/about/asia-highlights-top-banner-trust-pilot-rating-2022.png" alt="Asia Highlights TrustPilot rating" class="img-responsive">
+<img src="https://data.asiahighlights.com/image/forms/ah-top-banner-tp-rating.png" alt="Asia Highlights TrustPilot rating" class="img-responsive">
                 </div>
             </div>
             <div class="infotoptitle">

application/views/mobile_first/ah-lantern-festival-gp-form.php

@@ -1,9 +1,9 @@
 <script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
 <div class="tmbottom">
-    <h3 style="text-align: center; font-size: 20px; line-height: 22px;">Book this trip now. Your 1:1 travel consultant will reply within 1 working day.</h3>  
-    <form action="https://www.asiahighlights.com/orders/quick_inquiry_save" method="post" novalidate="" id='gp_form'>
+    <h3 style="text-align: center; font-size: 20px; line-height: 22px;">The premium tickets and hotel bookings are filling up quickly. Secure your seats on the tour right now!</h3>  
+    <form action="https://www.asiahighlights.com/orders/lantern_save" method="post" novalidate="" id='gp_form'>
         <textarea id="form_additionalrequirements" name="additional_requirements" placeholder="If you have other requirements such as adding private transport on arrival and departure day, extending the trip : pre - or post-tour, please let us know .... (optional)"></textarea>
-		<div class="selectionBlock">
+		<div class="selectionBlock" style="margin-bottom: 0;">
 			<div id="adultBlock" >
 				<p style="margin-bottom: 0; font-size: 22px; text-align: left;">Traveler numbers for your group:</p>
 					<div class="peopleSelect" >
@@ -12,7 +12,7 @@
 					   </p>
 					   <div class="numberBtn">
 						<input class="minaddBtn reduceadult" id="minusAdult" type="button" value="-">
-						<input class="number" type="text" id="adultNumber"  readonly value="1" name="adult_8_plus_yrs">
+						<input class="number" type="text" id="adultNumber"  readonly value="1" name="adult">
 						<input class="minaddBtn addadult" id="plusAdult"  type="button" value="+">
 					</div>
 					</div>
@@ -29,7 +29,7 @@
 					</div>
 				</div>
 		</div> 
-        <input class="FullName" id="realname" name="name" placeholder="Your name *" required="" type="text" value="" />
+        <input class="FullName" id="realname" name="fullname" placeholder="Your name *" required="" type="text" value="" />
     <div id="realname_errmsg" style="display: none">
     <div class="requiredArea" style="margin-top:-10px;">Please enter your name.</div>
     </div>
@@ -300,8 +300,8 @@
         <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
     <p style="font-size: 17px;
     color: #555;
-    margin-top: -10px;
-    margin-bottom: 5px;
+    margin-top: -5px;
+    margin-bottom: 15px;
     font-style: italic;
     padding-left: 0;
     line-height: 20px;
@@ -329,8 +329,14 @@
 						<label for="Video">Video appointment</label>
 					</div> 
    
-   
-    <button class="sendButton" id="submit_gp_form" type="button">Inquire Now</button>
+                    <p style="
+    clear: both;
+    margin: 40px 0 -30px 0;
+    font-style: italic;
+    color: #333;
+">A USD 200 deposit is required for each adult/child over 8. Please let us know if you need a single room or if you're traveling with children under 8. Any additional costs will be added to your balance.</p>
+    <button class="sendButton" id="submit_gp_form" type="button">Proceed to Payment</button>
+        <input name="total_price" id="totalPriceHidden" type="hidden" value="10000" />
     <input name="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/> 
     <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
     </form>
@@ -377,6 +383,16 @@
 			const minusAdultBtn = el('minusAdult');
 			const plusKidBtn = el('plusKid');
 			const minusKidBtn = el('minusKid');
+            const totalPriceHidden = el("totalPriceHidden");
+
+            function calcTotalPrice(ticketPrice, adultNumber) {
+                var totalPrice = ticketPrice * adultNumber;
+                if (adultNumber >= 10) {
+                    totalPrice = totalPrice * 0.95;
+                }
+
+                return totalPrice.toFixed(2);
+            }
 			
 			plusAdultBtn.on('click', () => {
 				adultNumberValue++;
@@ -441,6 +457,9 @@
 			const gp_form = el('gp_form');
 			submitFormBtn.on('click', () => {
 				if (validateGPForm()) {
+                    var ticketPrice = 200;
+					var totalPrice = calcTotalPrice(ticketPrice, adultNumberValue);
+                    totalPriceHidden.value = totalPrice;
 
 					if (typeof(grecaptcha) === "undefined") {
 						console.warn('grecaptcha is disabled.');

application/views/mobile_first/ah-lantern-form-info-page.php

@@ -1,8 +1,7 @@
 <script
     src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
 <div class="tmbottom">
-    <h3 style="font-size: 24px; line-height: 22px;">Get Your 2023 Chiang Mai CAD Lantern Mass Release
-        Tickets Here!</h3>
+    <h3 style="font-size: 24px; line-height: 22px;">Chiang Mai CAD Yi Peng Festival 2023 - Secure Your Exclusive Tickets Before They're Gone!</h3>
     <form id='ticket_form' action="https://www.asiahighlights.com/orders/lantern_save" method="post">
         <p style="    font-size: 22px;"><strong>Select Date</strong></p>
         <div class="selectHotl">
@@ -22,27 +21,27 @@
         <p style="    font-size: 22px;"><strong>Select Ticket Type</strong></p>
         <div class="selectHotl">
             <div class="optionLable" id="ticket_type_premium">
-                <input type="radio" value="Premium + Free Transfer" id="Premium" name="ticket_type">
-                <label for="Premium">
-                    Premium + Free Transfer
+                <input type="radio" value="Premium+Transfer+Dinner" id="Premium" name="ticket_type">
+                <label for="Premium" style="font-size:18px;">
+                Premium+Transfer+Dinner
                     <div class="selectionMemo">
                         US$199
                     </div>
                 </label>
             </div>
             <div class="optionLable" id="vip_type_premium">
-                <input type="radio" value="VIP + Free Transfer" id="VIP" name="ticket_type">
-                <label for="VIP">
-                    VIP + Free Transfer
+                <input type="radio" value="VIP+Transfer+Dinner" id="VIP" name="ticket_type">
+                <label for="VIP" style="font-size:18px;">
+                VIP+Transfer+Dinner
                     <div class="selectionMemo">
                         US$179
                     </div>
                 </label>
             </div>
             <div class="optionLable">
-                <input type="radio" value="Standard + Free Transfer" checked id="Standard" name="ticket_type">
-                <label for="Standard">
-                    Standard + Free Transfer
+                <input type="radio" value="Standard+Transfer+Dinner" checked id="Standard" name="ticket_type">
+                <label for="Standard" style="font-size:18px;">
+                Standard+Transfer+Dinner
                     <div class="selectionMemo">
                         US$139
                     </div>
@@ -402,11 +401,11 @@
         ticketTypeNode.addEventListener('click', function (event) {
             var currentTarget = event.currentTarget;
             var adultNumberValue = parseInt(adultNumberNode.value);
-            if (currentTarget.value === 'Premium + Free Transfer') {
+            if (currentTarget.value === 'Premium+Transfer+Dinner') {
                 ticketPrice = 199;
-            } else if (currentTarget.value === 'Standard + Free Transfer') {
+            } else if (currentTarget.value === 'Standard+Transfer+Dinner') {
                 ticketPrice = 139;
-            } else if (currentTarget.value === 'VIP + Free Transfer') {
+            } else if (currentTarget.value === 'VIP+Transfer+Dinner') {
                 ticketPrice = 179;
             }
             var totalPrice = calcTotalPrice(ticketPrice, adultNumberValue);

application/views/mobile_first/ah-lantern-form.php

@@ -1,7 +1,6 @@
 <script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
 <div class="tmbottom">
-    <h3 style="font-size: 24px; line-height: 22px;">Get Your 2023 Chiang Mai CAD Lantern Mass Release
-        Tickets Here!</h3>
+    <h3 style="font-size: 24px; line-height: 22px;">Chiang Mai CAD Yi Peng Festival 2023 - Secure Your Exclusive Tickets Before They're Gone!</h3>
     <form id='ticket_form' action="https://www.asiahighlights.com/orders/lantern_save" method="post" >
         <p style="    font-size: 22px;"><strong>Select Date</strong></p>
 		<div class="selectHotl">
@@ -21,27 +20,27 @@
         <p style="    font-size: 22px;"><strong>Select Ticket Type</strong></p>
 		<div class="selectHotl">
             <div class="optionLable" id="ticket_type_premium">
-                <input type="radio" value="Premium + Free Transfer" id="Premium" name="ticket_type">
-                <label for="Premium">
-                    Premium + Free Transfer
+                <input type="radio" value="Premium+Transfer+Dinner" id="Premium" name="ticket_type">
+                <label for="Premium" style="font-size:18px;">
+                Premium+Transfer+Dinner
                     <div class="selectionMemo">
                         US$199
                     </div>
                 </label>
             </div>
             <div class="optionLable" id="vip_type_premium">
-                <input type="radio" value="VIP + Free Transfer" id="VIP" name="ticket_type">
-                <label for="VIP">
-                    VIP + Free Transfer
+                <input type="radio" value="VIP+Transfer+Dinner" id="VIP" name="ticket_type">
+                <label for="VIP" style="font-size:18px;">
+                VIP+Transfer+Dinner
                     <div class="selectionMemo">
                         US$179
                     </div>
                 </label>
             </div>
             <div class="optionLable">
-                <input type="radio" value="Standard + Free Transfer" checked id="Standard" name="ticket_type">
-                <label for="Standard">
-                    Standard + Free Transfer
+                <input type="radio" value="Standard+Transfer+Dinner" checked id="Standard" name="ticket_type">
+                <label for="Standard" style="font-size:18px;">
+                Standard+Transfer+Dinner
                     <div class="selectionMemo">
                         US$139
                     </div>
@@ -396,11 +395,11 @@
         ticketTypeNode.addEventListener('click', function (event) {
             var currentTarget = event.currentTarget;
             var adultNumberValue = parseInt(adultNumberNode.value);
-            if (currentTarget.value === 'Premium + Free Transfer') {
+            if (currentTarget.value === 'Premium+Transfer+Dinner') {
                 ticketPrice = 199;
-            } else if (currentTarget.value === 'Standard + Free Transfer') {
+            } else if (currentTarget.value === 'Standard+Transfer+Dinner') {
                 ticketPrice = 139;
-            } else if (currentTarget.value === 'VIP + Free Transfer') {
+            } else if (currentTarget.value === 'VIP+Transfer+Dinner') {
                 ticketPrice = 179;
             }
             var totalPrice = calcTotalPrice(ticketPrice, adultNumberValue);

application/views/mobile_first/ah-pc.php

@@ -157,10 +157,11 @@
                         <div class=" dropdown-content">
                             <div class="inspirationinfo">
                                 <div class="inspirationlist navi_destination">
-                                    <span class="inspirationtitle">Southeast Asia:</span>
+                                    <span class="inspirationtitle"><a href="/southeast-asia/tours">Southeast Asia:</a></span>
 
                                     <ul class="inspiration">
                                         <li><a href="/thailand">Thailand</a></li>
+                                        <li><a href="/thailand/tours/lantern-festival">Thailand Lantern Festival</a></li>
                                         <li><a href="/vietnam">Vietnam</a></li>
                                         <li><a href="/cambodia">Cambodia</a></li>
                                         <li><a href="/laos">Laos</a></li>
@@ -184,7 +185,7 @@
                                 </div>
 
                                 <div class="inspirationlist navi_destination">
-                                    <span class="inspirationtitle">India & Himalaya:</span>
+                                    <span class="inspirationtitle"><a href="/india/tours">India & Himalaya:</a></span>
                                     <ul class="inspiration">
                                         <li><a href="/india">India</a></li>
                                         <li><a href="/nepal">Nepal</a></li>

application/views/mobile_first/ah.php

@@ -154,12 +154,14 @@
       <!-- destinations -->
       <ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu" aria-label="destinations">
           <li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand">Thailand</a></li>
+          <li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand/tours/lantern-festival">Thailand Lantern Festival</a></li>
           <li class="menu__item" role="menuitem"><a class="menu__link" href="/vietnam">Vietnam</a></li>
           <li class="menu__item" role="menuitem"><a class="menu__link" href="/cambodia">Cambodia</a></li>
           <li class="menu__item" role="menuitem"><a class="menu__link" href="/laos">Laos</a></li>
           <li class="menu__item" role="menuitem"><a class="menu__link" href="/bali">Indonesia(Bali)</a></li>
           <li class="menu__item" role="menuitem"><a class="menu__link" href="/singapore">Singapore</a></li>
           <li class="menu__item" role="menuitem"><a class="menu__link" href="/myanmar">Myanmar</a></li>
+          <li class="menu__item" role="menuitem"><a class="menu__link" href="/southeast-asia/tours">All Southeast Asia Destinations</a></li>
       </ul>
       <ul data-menu="submenu-10" id="submenu-10" class="menu__level" tabindex="-1" role="menu" aria-label="destinations">
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan">Japan</a></li>
@@ -172,6 +174,7 @@
       <li class="menu__item" role="menuitem"><a class="menu__link" href="/nepal">Nepal</a></li>
       <li class="menu__item" role="menuitem"><a class="menu__link" href="/bhutan">Bhutan</a></li>
       <li class="menu__item" role="menuitem"><a class="menu__link" href="/srilanka">Sri Lanka</a></li>
+      <li class="menu__item" role="menuitem"><a class="menu__link" href="/india/tours">All India & Himalaya Destinations</a></li>
   </ul>
   <ul data-menu="submenu-12" id="submenu-12" class="menu__level" tabindex="-1" role="menu" aria-label="destinations">
     <li class="menu__item" role="menuitem"><a class="menu__link" href="https://www.globalhighlights.com/middle-east/tours" target="_blank">Middle East Destinations</a></li>

application/views/mobile_first/ch-feedback-list.php

@@ -1,19 +1,19 @@
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;">
-  98.8% positive customer reviews among 10,000+
-  <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
-  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
-    </div>
+<h2 style="
+text-align: center; padding-bottom: 0;
+"><em style="
+color: #ad1818;
+">98.8%</em> Positive Customer reviews among 10,000+</h2>
+<div class="visible-xs" style="margin: 0 20px;">
+  <img class="img-responsive" height="69" src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" style="float: left; width: 150px; " width="175">
+  <img height="40" src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" style="width: 120px; height: auto; " width="211">
   </div>
 <div class="table-responsive">
   <table>
     <tbody>
       <tr>
         <td class="hidden-xs">
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
-            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 25px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
-            <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
-            
-            </div>
+          <div class="feedback_logo" >
+            <img  class="img-responsive" height="69" src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" style="margin: 0px auto; " width="175"> <img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" style="width: 170px; display: block; margin: 10px auto 0px; " width="1133"></div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>
 
@@ -27,13 +27,13 @@
                 <?php echo $feedback['content'] ?>
               </p>
               <a href="<?php echo $feedback['url'] ?>" target="_blank">more</a>
+              <div class="customer_name">
+                <?php echo $feedback['createdOn'] ?>,
+                <?php echo $feedback['customer'] ?>
+              </div>
+          
             </div>
-            <div class="customer_name">
-              <?php echo $feedback['createdOn'] ?>,
-              <?php echo $feedback['customer'] ?>
-            </div>
-            <img alt="" class="img-responsive" height="40" width="211"
-              src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png">
+            
           </div>
         </td>
         <?php }?>

application/views/mobile_first/ch-feedback-newest.php

@@ -1,19 +1,17 @@
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;">
-  98.8% positive customer reviews among 10,000+
-  <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
-  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
-    </div>
-  </div>
+<h2 style="
+text-align: center; padding-bottom: 0;
+"><em style="color: #ad1818;">98.8%</em> Positive Customer reviews among 10,000+</h2>
+<div class="visible-xs" style="margin: 0 20px;">
+<img  class="img-responsive" height="69" src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" style="float: left; width: 150px; " width="175">
+<img  height="40" src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" style="width: 120px; height: auto; " width="211">
+</div>
 <div class="table-responsive">
   <table>
     <tbody>
       <tr>
       <td class="hidden-xs">
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
-            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 25px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
-            <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
-            
-            </div>
+        <div class="feedback_logo">
+          <img  class="img-responsive" height="69" src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" style="margin: 0px auto; " width="175"> <img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" style="width: 170px; display: block; margin: 10px auto 0px; " width="1133"></div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>
 
@@ -27,13 +25,12 @@
                 <?php echo $feedback['content'] ?>
               </p>
               <a href="<?php echo $feedback['url'] ?>" target="_blank">more</a>
+              <div class="customer_name">
+                <?php echo $feedback['createdOn'] ?>,
+                <?php echo $feedback['customer'] ?>
+              </div>
             </div>
-            <div class="customer_name">
-              <?php echo $feedback['createdOn'] ?>,
-              <?php echo $feedback['customer'] ?>
-            </div>
-            <img alt="" class="img-responsive" height="40" width="211"
-              src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png">
+         
           </div>
         </td>
         <?php }?>

application/views/mobile_first/ch-h1.php

@@ -5,6 +5,9 @@
     <div class="infotopimage">
         <img src="<?php echo 'https://images.chinahighlights.com'.$ic_photo; ?>"
             alt="<?php echo !empty($ic_title)?$ic_title:'H1 title Chinahighlights mobile first template'; ?>" class="img-responsive">
+            <div class="ta_tag">
+            <img  src="https://data.chinahighlights.com/image/forms/ch-2023-trip-advisor-excellent-certificate.png" style="width: 120px !important;height: auto;">
+        </div>
     </div>
 <?php } ?>
     <div class="infocategory">

application/views/mobile_first/ch-pc.php

@@ -320,6 +320,7 @@
             </div>
             <!--@TIPS-RIGHT-TOP@-->
             <!--@TIPS-RIGHT@-->
+            <!--@TIPS-RIGHT-LIST@-->
         </div>
     </div>
     <!--PC底部-->

application/views/mobile_first/ch-tips-right-list.php

@@ -0,0 +1,26 @@
+<div class="right_tour">
+<div class="info_ad_title" style="display: flex;">Popular tours</div>
+<div class="right_ad_list">
+<ul>
+<?php foreach ($tips_right_a as $index => $info) {?>
+  <li><a href="<?php echo $info->ic_url ?>" id="right_ad_list_tours"><?php echo $info->ic_title ?></a></li>
+<?php }?>
+</ul>
+</div>
+<div class="info_ad_title" style="display: flex;">Make the most of your time</div>
+<div class="right_ad_list">
+<ul>
+<?php foreach ($tips_right_b as $index => $info) {?>
+  <li><a href="<?php echo $info->ic_url ?>" id="right_ad_list_plan"><?php echo $info->ic_title ?></a></li>
+<?php }?>
+</ul>
+</div>
+<div class="info_ad_title" style="display: flex;">Choose the best time to visit</div>
+<div class="right_ad_list">
+<ul>
+<?php foreach ($tips_right_c as $index => $info) {?>
+  <li><a href="<?php echo $info->ic_url ?>" id="right_ad_list_weather"><?php echo $info->ic_title ?></a></li>
+<?php }?>
+</ul>
+</div>
+</div>

application/views/mobile_first/ch-visa-free-tester.php

@@ -1187,12 +1187,12 @@ ready(el => {
     const indexOf72 = selectedOption.getAttribute('data-hour').indexOf('72');
     const indexOf144 = selectedOption.getAttribute('data-hour').indexOf('144');
     
-    if (diffInDays < 1 || diffInDays > 2 || indexOf72 == -1) {
+    if (diffInDays < 1 || diffInDays > 3 || indexOf72 == -1) {
       visa72hours = false;
       error_72hours.show();
     }
 
-    if (diffInDays < 1 || diffInDays > 7 || indexOf144 == -1) {
+    if (diffInDays < 1 || diffInDays > 6 || indexOf144 == -1) {
       visa144hours = false;
       error_72hours.show();
     }
@@ -1238,6 +1238,6 @@ ready(el => {
     border-radius: 6px !important;
     height: 40px !important;}
         @media (max-width: 750px) {
-          .date_pick {width: 100% !important;}      
+          .date_pick {width: 87% !important;}      
         }
 </style>

application/views/mobile_first/gh-feedback-newest.php

@@ -1,22 +1,18 @@
 
-
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 100px;">
-  98.8% positive customer reviews among 10,000+
-  <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20" ><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
-  </div>
-<p class="visible-xs" style="margin-bottom: -50px;">
-  <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" style="margin-top: 50px;">
+<h2 style="
+text-align: center;
+"><em style="color: #ad1818;">98.8%</em> Positive Customer reviews among 10,000+</h2>
+<div class="visible-xs" style="margin: 0 20px;">
+<img class="img-responsive" height="69" src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" style="float: left; width: 150px; " width="175">
+<img height="40" src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" style="width: 120px; height: auto; " width="211">
+</div>
+<div class="table-responsive">
   <table>
     <tbody>
       <tr>
         <td class="hidden-xs">
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
-            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 50px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
-            <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
-            
-            </div>
+          <div class="feedback_logo">
+            <img  class="img-responsive" height="69" src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" style="margin: 0px auto; " width="175"> <img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" style="width: 170px; display: block; margin: 10px auto 0px; " width="1133"></div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>
         <td>

application/views/mobile_first/gh-pc.php

@@ -70,25 +70,23 @@
             <div class="p_topnavigation">
                 <ul class="pctopnavi">
                     <li class="dropdown"><a class="p_topnavilink" href="/destinations">Destinations</a>
-                        <div class=" dropdown-content">
+                        <div class="dropdown-content">
                             <div class="inspirationinfo">
                                 <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">North Asia</div>
-
+                                    <div class="inspirationtitle"><a href="/middle-east/tours">Middle East</a></div>
                                     <ul class="inspiration">
-                                        <li><a href="https://www.chinahighlights.com/tour/" target="_blank">China</a>
-                                        </li>
-                                        <li><a href="https://www.asiahighlights.com/japan/tours"
-                                                target="_blank">Japan</a></li>
-                                        <li><a href="https://www.asiahighlights.com/asia/plan-a-two-week-itinerary-in-japan-and-south-korea"
-                                                target="_blank">South
-                                                Korea</a></li>
-                                        <li><a href="https://www.asiahighlights.com/asia/tours/mongolia-china-and-thailand"
-                                                target="_blank">
-                                                Mongolia</a></li>
+                                        <li><a href="/egypt/tours">Egypt
+                                            </a></li>
+                                        <li><a href="/israel/plan-a-trip">Israel
+                                            </a></li>
+                                        <li><a href="/jordan/plan-a-trip">Jordan
+                                            </a></li>
+                                        <li><a href="/turkey/tours">Turkey
+                                            </a></li>
+                                        <li><a href="/morocco/tours">Moroco
+                                            </a></li>
                                     </ul>
                                 </div>
-
                                 <div class="inspirationlist vacationtype">
                                     <div class="inspirationtitle">Southeast Asia</div>
                                     <ul class="inspiration">
@@ -110,41 +108,34 @@
                                                 (Bali)</a></li>
                                     </ul>
                                 </div>
-
                                 <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">Central Asia</div>
+                                    <div class="inspirationtitle">North Asia</div>
+
                                     <ul class="inspiration">
-                                        <li><a href="https://www.asiahighlights.com/caucasus-central-asia/tours"
-                                                target="_blank">Caucasus
-                                                and Central Asia</a></li>
+                                        <li><a href="https://www.chinahighlights.com/tour/" target="_blank">China</a>
+                                        </li>
+                                        <li><a href="https://www.asiahighlights.com/japan/tours"
+                                                target="_blank">Japan</a></li>
+                                        <li><a href="https://www.asiahighlights.com/asia/plan-a-two-week-itinerary-in-japan-and-south-korea"
+                                                target="_blank">South
+                                                Korea</a></li>
+                                        <li><a href="https://www.asiahighlights.com/asia/tours/mongolia-china-and-thailand" target="_blank">Mongolia</a></li>
                                     </ul>
                                 </div>
                                 <div class="inspirationlist vacationtype">
-                                <div class="inspirationtitle"><a href="/middle-east/tours">Middle East</a></div>
-                                    <ul class="inspiration">
-                                        <li><a href="/egypt/tours">Egypt
-                                            </a></li>
-                                        <li><a href="/israel/plan-a-trip">Israel
-                                            </a></li>
-                                        <li><a href="/jordan/plan-a-trip">Jordan
-                                            </a></li>
-                                        <li><a href="/turkey/tours">Turkey
-                                            </a></li>
-                                        <li><a href="/morocco/tours">Moroco
-                                            </a></li>
-                                    </ul>
+                                    <div class="inspirationtitle">South America</div>
+                                    <ul class="inspiration"><li><a href="/peru/2-week-itinerary">Peru</a></li></ul>
                                 </div>
                                 <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">South America</div>
+                                    <div class="inspirationtitle">Central Asia</div>
                                     <ul class="inspiration">
-                                        <li><a href="/peru/2-week-itinerary">Peru</a></li>
+                                        <li><a href="https://www.asiahighlights.com/caucasus-central-asia/tours" target="_blank">Caucasus and Central Asia</a></li>
                                     </ul>
                                 </div>
                             </div>
-
                         </div>
-
                     </li>
+
                     <li class="dropdown"><a class="p_topnavilink">Itinerary Ideas</a>
                         <div class="destinationspc dropdown-content">
                             <div class="inspirationinfo">
@@ -153,11 +144,11 @@
                                     <div class="listtour">
                                         <ul class="inspiration">
                                             <li><a href="/egypt/one-week-in-egypt">Egypt</a></li>
-                                            <li><a
-                                                    href="https://www.chinahighlights.com/travelguide/one-week-china-itinerary.htm" target="_blank">China</a>
+                                            <li><a href="https://www.chinahighlights.com/travelguide/one-week-china-itinerary.htm"
+                                                    target="_blank">China</a>
                                             </li>
-                                            <li><a
-                                                    href="https://www.asiahighlights.com/japan/1-week-itinerary" target="_blank">Japan</a>
+                                            <li><a href="https://www.asiahighlights.com/japan/1-week-itinerary"
+                                                    target="_blank">Japan</a>
                                             </li>
                                         </ul>
                                     </div>
@@ -167,14 +158,14 @@
                                     <div class="inspirationtitle">10 Days</div>
                                     <div class="listtour">
                                         <ul class="inspiration">
-                                            <li><a
-                                                    href="https://www.asiahighlights.com/southeast-asia/10-days-itinerary" target="_blank">Southeast
+                                            <li><a href="https://www.asiahighlights.com/southeast-asia/10-days-itinerary"
+                                                    target="_blank">Southeast
                                                     Asia</a></li>
-                                            <li><a
-                                                    href="https://www.asiahighlights.com/japan/10-day-itineraries" target="_blank">Japan</a>
+                                            <li><a href="https://www.asiahighlights.com/japan/10-day-itineraries"
+                                                    target="_blank">Japan</a>
                                             </li>
-                                            <li><a
-                                                    href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm" target="_blank">China</a>
+                                            <li><a href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm"
+                                                    target="_blank">China</a>
                                             </li>
                                         </ul>
 
@@ -184,26 +175,26 @@
                                     <div class="inspirationtitle">2 Weeks</div>
                                     <div class="listtour">
                                         <ul class="inspiration">
-                                            <li><a
-                                                    href="https://www.asiahighlights.com/southeast-asia/2-weeks-itinerary" target="_blank">
+                                            <li><a href="https://www.asiahighlights.com/southeast-asia/2-weeks-itinerary"
+                                                    target="_blank">
                                                     Southeast Asia</a></li>
-                                            <li><a
-                                                    href="https://www.asiahighlights.com/japan/2-week-itineraries" target="_blank">Japan</a>
+                                            <li><a href="https://www.asiahighlights.com/japan/2-week-itineraries"
+                                                    target="_blank">Japan</a>
                                             </li>
-                                            <li><a
-                                                    href="https://www.asiahighlights.com/asia/plan-a-two-week-itinerary-in-japan-and-south-korea" target="_blank">Japan
+                                            <li><a href="https://www.asiahighlights.com/asia/plan-a-two-week-itinerary-in-japan-and-south-korea"
+                                                    target="_blank">Japan
                                                     and South Korea</a></li>
-                                            <li><a
-                                                    href="https://www.asiahighlights.com/asia/tours/japan-china-discovery" target="_blank">Japan
+                                            <li><a href="https://www.asiahighlights.com/asia/tours/japan-china-discovery"
+                                                    target="_blank">Japan
                                                     and China</a></li>
-                                            <li><a
-                                                    href="https://www.chinahighlights.com/travelguide/2-weeks-china-itinerary.htm" target="_blank">China</a>
+                                            <li><a href="https://www.chinahighlights.com/travelguide/2-weeks-china-itinerary.htm"
+                                                    target="_blank">China</a>
                                             </li>
-                                            <li><a
-                                                    href="https://www.asiahighlights.com/india/2-week-itinerary" target="_blank">India</a>
+                                            <li><a href="https://www.asiahighlights.com/india/2-week-itinerary"
+                                                    target="_blank">India</a>
                                             </li>
                                             <li><a href="/egypt/2-week-itinerary">Egypt</a></li>
-                                            <li><a href="/middle-east/2-week-trip-to-egypt-and-jordan">Egypt and
+                                            <li><a href="/middle-east/tours/egypt-jordan">Egypt and
                                                     Jordan</a></li>
                                             <li><a href="/peru/2-week-itinerary">Peru</a></li>
                                         </ul>
@@ -214,18 +205,25 @@
                                     <div class="inspirationtitle">3 Weeks</div>
                                     <ul class="inspiration">
                                         <li><a href="/egypt/3-week-itinerary">Egypt</a></li>
-                                        <li><a href="https://www.asiahighlights.com/southeast-asia/3-weeks-itinerary" target="_blank">Southeast Asia</a></li>
-                                        <li><a href="https://www.asiahighlights.com/japan/3-week-itineraries" target="_blank">Japan</a></li>
-                                        <li><a href="https://www.chinahighlights.com/travelguide/3-weeks-china-itinerary.htm" target="_blank">China</a></li>
-                                        <li><a href="https://www.asiahighlights.com/asia/tours/china-and-vietnam" target="_blank">China and Vietnam</a></li>
-                                        <li><a href="https://www.asiahighlights.com/asia/tours/nepal-tibet-bhutan" target="_blank">Tibet, Nepal, and Bhutan</a></li>
+                                        <li><a href="https://www.asiahighlights.com/southeast-asia/3-weeks-itinerary"
+                                                target="_blank">Southeast Asia</a></li>
+                                        <li><a href="https://www.asiahighlights.com/japan/3-week-itineraries"
+                                                target="_blank">Japan</a></li>
+                                        <li><a href="https://www.chinahighlights.com/travelguide/3-weeks-china-itinerary.htm"
+                                                target="_blank">China</a></li>
+                                        <li><a href="https://www.asiahighlights.com/asia/tours/china-and-vietnam"
+                                                target="_blank">China and Vietnam</a></li>
+                                        <li><a href="https://www.asiahighlights.com/asia/tours/nepal-tibet-bhutan"
+                                                target="_blank">Tibet, Nepal, and Bhutan</a></li>
                                     </ul>
                                 </div>
                                 <div class="inspirationlist vacationtype">
                                     <div class="inspirationtitle">4 Weeks</div>
                                     <ul class="inspiration">
-                                        <li><a href="https://www.chinahighlights.com/travelguide/4-week-china-itinerary.htm" target="_blank">China</a></li>
-                                            <li><a href="https://www.asiahighlights.com/southeast-asia/4-weeks-itinerary" target="_blank">Southeast Asia</a></li>
+                                        <li><a href="https://www.chinahighlights.com/travelguide/4-week-china-itinerary.htm"
+                                                target="_blank">China</a></li>
+                                        <li><a href="https://www.asiahighlights.com/southeast-asia/4-weeks-itinerary"
+                                                target="_blank">Southeast Asia</a></li>
                                     </ul>
                                 </div>
                             </div>
@@ -277,12 +275,13 @@
                 </ul>
             </div>
             <!--@TIPS-RIGHT@-->
+            <!--@TIPS-RIGHT-LIST@-->
             <div class="info_tm_button"><a href="/forms/tailormade?product_code=" id="create_my_trip_button_pc">Create my trip</a>
             </div>
         </div>
         <!--PC正文 结束-->
     </div>
-<!--@ARTICLENEXT@-->
+    <!--@ARTICLENEXT@-->
     <!--PC底部-->
 
 
@@ -320,15 +319,11 @@
         <div class="footerContent">
             <h2>The Global Highlights Experience</h2>
             <div class="footerFeatures">
-
-
-
                 <div class=" whyuscontent">
                     <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png"
                         alt="1-to-1 Expert Planning" class="img-responsive">
                     <div class="featureTitle">1-to-1 Expert Planning</div>
                     <ul>
-
                         <li>Your tour will be tailor-made to suit you by a destination expert. Your personal travel
                             advisor will always reply within 24 hours.</li>
                     </ul>
@@ -338,7 +333,6 @@
                         alt="Personal Journeys" class="img-responsive">
                     <div class="featureTitle">Personal Journeys</div>
                     <ul>
-
                         <li>Enjoy having your own personal local guide and ride. Explore destinations at your own pace.
                             Have as much flexibility as possible.</li>
                     </ul>
@@ -349,7 +343,6 @@
                         alt="Authentic Experiences" class="img-responsive">
                     <div class="featureTitle">Authentic Experiences</div>
                     <ul>
-
                         <li>Go beyond the sightseeing. Understand the destinations by practicing the local culture and
                             interacting with local people.</li>
                     </ul>
@@ -359,19 +352,12 @@
                         alt="One-Stop Service" class="img-responsive">
                     <div class="featureTitle">One-Stop Service</div>
                     <ul>
-
                         <li>Leave all the booking work to us, including international and internal transportation,
                             visas, hotels, meals, and activities. </li>
                     </ul>
                 </div>
 
-
-
                 <div class=" partner">
-
-
-
-
                     <ul class="withBorder">
                         <li><a href="/travel-agents">Travel Agents</a></li>
                         <li><a href="/about" rel="nofollow">About us</a></li>
@@ -410,23 +396,18 @@
                     <div class="corporate_number_pc">China Highlights International Travel Service Co., LTD<br>
                         Corporate Number: 914503003486045699</div>
                 </div>
-
             </div>
-
-
         </div>
-
-
     </div>
+
     <div class="clear"></div>
     <div class="bottom_destinations">
         <div class="footerbox">
-        <h2 style="
+            <h2 style="
     margin-top: 0;
     text-align: center;
 ">Where Can We Take You Today?</h2>
             <div class="listtour">
-
                 <div class="destination_links">
                     <ul>
                         <li><a href="/egypt/tours">Egypt Tours</a></li>
@@ -462,13 +443,11 @@
     </div>
     <div class="bottomlogo">
         <div class="footerbox">
-
             <img src="https://data.chinahighlights.com/image/aboutus/gh-bottom-logo.png"
                 class="img-responsive bottomlogopc">
             <div class="bottomcopyright">© 2018-2023 Global Highlights — Discovery Your Way! </div>
             <div class="bottomprivacy"><a href="/privacy.htm">Privacy Policy</a> | <a href="/terms-of-use.htm">Terms</a>
             </div>
-
         </div>
     </div>
     <div class="web_cookie" style='display: none;' id='gotIdArea'>

application/views/mobile_first/gh-tips-right-list.php

@@ -0,0 +1,26 @@
+<div class="right_tour">
+<div class="info_ad_title" style="display: flex;">Popular tours</div>
+<div class="right_ad_list">
+<ul>
+<?php foreach ($tips_right_a as $index => $info) {?>
+  <li><a href="<?php echo $info->ic_url ?>" id="right_ad_list_tours"><?php echo $info->ic_title ?></a></li>
+<?php }?>
+</ul>
+</div>
+<div class="info_ad_title" style="display: flex;">Make the most of your time</div>
+<div class="right_ad_list">
+<ul>
+<?php foreach ($tips_right_b as $index => $info) {?>
+  <li><a href="<?php echo $info->ic_url ?>" id="right_ad_list_plan"><?php echo $info->ic_title ?></a></li>
+<?php }?>
+</ul>
+</div>
+<div class="info_ad_title" style="display: flex;">Choose the best time to visit</div>
+<div class="right_ad_list">
+<ul>
+<?php foreach ($tips_right_c as $index => $info) {?>
+  <li><a href="<?php echo $info->ic_url ?>" id="right_ad_list_weather"><?php echo $info->ic_title ?></a></li>
+<?php }?>
+</ul>
+</div>
+</div>