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

.github/workflows/Deploy CN.yml

@@ -1,4 +1,4 @@
-#  .
+# Disabled
 name: 🚀 Deploy INFO-SYS
 on:
   # Triggers the workflow on push or pull request events but only for the master branch

.github/workflows/Deploy.yml

@@ -92,3 +92,90 @@ jobs:
           *.exe
           *.docx
           .ftp-deploy-sync-state.json
+
+  hn-notification:
+    needs: gh-win-cn-deploy
+    name: 🔔 Send notificaiton
+    runs-on: ubuntu-latest
+    if: always() # set "always"
+    steps:
+    - name: 🚚 Get latest code
+      uses: actions/checkout@v3
+      # run this action to get the workflow conclusion
+      # You can get the conclusion via env (env.WORKFLOW_CONCLUSION)
+    - uses: technote-space/workflow-conclusion-action@v3
+
+    - name: Expose git commit data
+      uses: rlespinasse/git-commit-data-action@v1
+
+    - name: Print git commit data
+      run: |
+        echo "Get workflow conclusion"
+        echo " - ${{ env.WORKFLOW_CONCLUSION }}"
+        echo "Get commit info"
+        echo " - ${{ env.GIT_COMMIT_SHA }}"
+        echo " - ${{ env.GIT_COMMIT_SHORT_SHA }}"
+
+# echo "Get author info"
+# echo " - ${{ env.GIT_COMMIT_AUTHOR }}"
+# echo " - ${{ env.GIT_COMMIT_AUTHOR_NAME }}"
+# echo " - ${{ env.GIT_COMMIT_AUTHOR_EMAIL }}"
+# echo "Get committer info"
+# echo " - ${{ env.GIT_COMMIT_COMMITTER }}"
+# echo " - ${{ env.GIT_COMMIT_COMMITTER_NAME }}"
+# echo " - ${{ env.GIT_COMMIT_COMMITTER_EMAIL }}"
+# echo "Get message info"
+# echo " - ${{ env.GIT_COMMIT_MESSAGE_SUBJECT }}"
+# echo " - ${{ env.GIT_COMMIT_MESSAGE_SUBJECT_SANITIZED }}"
+# echo " - ${{ env.GIT_COMMIT_MESSAGE_BODY }}"
+
+    - name: ✉ Send some mail
+      uses: dawidd6/action-send-mail@v3
+      with:
+        # Specify connection via URL (replaces server_address, server_port, secure,
+        # username and password)
+        #
+        # Format:
+        #
+        #  * smtp://user:password@server:port
+        #  * smtp+starttls://user:password@server:port
+        # connection_url: ${{secrets.MAIL_CONNECTION}}
+        # Required mail server address if not connection_url:
+        server_address: hwsmtp.exmail.qq.com
+        # Server port, default 25:
+        server_port: 465
+        # Optional whether this connection use TLS (default is true if server_port is 465)
+        secure: true
+        # Optional (recommended) mail server username:
+        username: ${{secrets.MAIL_USERNAME}}
+        # Optional (recommended) mail server password:
+        password: ${{secrets.MAIL_PASSWORD}}
+        # Required mail subject:
+        subject: ${{env.WORKFLOW_CONCLUSION}} ${{ github.repository }}
+        # Required recipients' addresses:
+        to: ${{ env.GIT_COMMIT_COMMITTER_EMAIL }}
+        # Required sender full name (address can be skipped):
+        from: Git # <user@example.com>
+        # Optional plain body:
+        body: |
+          ${{ env.WORKFLOW_CONCLUSION }}
+          ${{ github.repository }}
+          ${{ env.GIT_COMMIT_SHORT_SHA }}: ${{ env.GIT_COMMIT_MESSAGE_SUBJECT }}
+        # Optional HTML body read from file:
+        # html_body: file://README.html
+        # Optional carbon copy recipients:
+        # cc: lyt@hainatravel.com
+        # Optional blind carbon copy recipients:
+        # bcc: r2d2@example.com,hansolo@example.com
+        # Optional recipient of the email response:
+        # reply_to: luke@example.com
+        # Optional Message ID this message is replying to:
+        # in_reply_to: <random-luke@example.com>
+        # Optional unsigned/invalid certificates allowance:
+        ignore_cert: true
+        # Optional converting Markdown to HTML (set content_type to text/html too):
+        convert_markdown: true
+        # Optional attachments:
+        # attachments: attachments.zip,git.diff,./dist/static/*.js
+        # Optional priority: 'high', 'normal' (default) or 'low'
+        priority: low

application/controllers/information.php

@@ -1679,6 +1679,7 @@ class Information extends CI_Controller
 
         $data = array();
         $data['information'] = $information;
+        $recommand_template = '';
         switch ($device) {
             case 'mobile':
                 //获取移动优先的模板，如果有的话
@@ -1689,6 +1690,7 @@ class Information extends CI_Controller
                 } else {
                     return false;
                 }
+                $recommand_template = 'mobile_first/ah-next-mobile';
                 break;
             case 'pc':
                 //获取PC的模板，如果有的话
@@ -1699,6 +1701,7 @@ class Information extends CI_Controller
                 } else {
                     return false;
                 }
+                $recommand_template = 'mobile_first/ah-next';
                 break;
             default:
         }
@@ -1771,9 +1774,8 @@ class Information extends CI_Controller
         );
 
         //推荐信息或者产品
-        //信息推荐
-        $template_recommand = $recommand_information; // $this->recommand_information($information);
-        $template = str_replace('<!--@ARTICLENEXT@-->', $this->load->view($template_path . '-next', array('recommands' => $template_recommand), true), $template);
+        $template_recommand = $recommand_information;
+        $template = str_replace('<!--@ARTICLENEXT@-->', $this->load->view($recommand_template, array('recommands' => $template_recommand), true), $template);
         //广告，改叫tips，防止被插件屏蔽
         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);
@@ -2801,7 +2803,7 @@ class Information extends CI_Controller
         }
         if (!empty($data)) {
             $exclude_ids[] = $data->is_id;
-            //读取附加移动端图片
+            $data->desktop_photo = get_meta($data->ic_id, 'meta_addon_picture');
             $data->mobile_photo = get_meta($data->ic_id, 'meta_addon_picture_mobile');
             if (empty($data->mobile_photo)) {
                 if (!empty($data->ic_photo)) {

application/views/bootstrap/header.php

@@ -139,7 +139,7 @@
                 value="<?php echo isset($keywords) ? $keywords : false; ?>">
               <button class="btn">搜索</button>
               <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) { ?>
-              <a href="https://res.chinarundreisen.com/icht-heroes/#/picture-manager/picture-storehouse" target="_blank"
+              <a href="https://cdn.chinarundreisen.com/icht-heroes/#/picture-manager/picture-storehouse" target="_blank"
                 class="btn" title="图片上传管理"><i class="icon-picture"></i></a>
               <?php } else { ?>
               <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"><i

application/views/bootstrap3/header.php

@@ -12,124 +12,123 @@
   <link rel="shortcut icon" href="/bootstrap/img/glyphicons_290_skull.png">
 
   <script language="javascript">
-  //资源文件上传管理
-  function openKCFinder_singleFile_res() {
+    //资源文件上传管理
+    function openKCFinder_singleFile_res() {
 
-    CKFinder.modal({
-      chooseFiles: true,
-      pass: 'sitecode',
-      sitecode: '<?php echo $this->config->item('site_code'); ?>',
-      width: 1024,
-      height: 800,
-      onInit: function(finder) {
-        finder.on('files:choose', function(evt) {
-          var file = evt.data.files.first();
-          alert(file.getUrl());
-        });
+      CKFinder.modal({
+        chooseFiles: true,
+        pass: 'sitecode',
+        sitecode: '<?php echo $this->config->item('site_code'); ?>',
+        width: 1024,
+        height: 800,
+        onInit: function (finder) {
+          finder.on('files:choose', function (evt) {
+            var file = evt.data.files.first();
+            alert(file.getUrl());
+          });
 
-        finder.on('file:choose:resizedImage', function(evt) {
-          alert(evt.data.resizedUrl);
-        });
-      }
-    });
+          finder.on('file:choose:resizedImage', function (evt) {
+            alert(evt.data.resizedUrl);
+          });
+        }
+      });
 
 
-    /*
-    window.KCFinder = {};
-    window.KCFinder.callBack = function(url) {
-    	<?php
-        switch ($this->config->item('site_code')) {
-            case 'ah':
-                echo "alert(url.replace('/kcfinder/upload/ah/','https://data.asiahighlights.com/'));";
-                break;
-            case 'gm':
-                echo "alert(url.replace('/kcfinder/upload/gm/','https://data.chinarundreisen.com/'));";
-                break;
-            default:
-                echo 'alert(url);';
-        }
-        ?>
-    	window.KCFinder = null;
-    };
-    window.open('/kcfinder/browse.php?type=<?php echo $this->config->item('site_code'); ?>', 'kcfinder_textbox', 'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600' );
 
-    */
-  }
+      // window.KCFinder = {};
+      // window.KCFinder.callBack = function (url) {
+      //   <?php
+      //   switch ($this->config->item('site_code')) {
+      //     case 'ah':
+      //       echo "alert(url.replace('/kcfinder/upload/ah/','https://data.asiahighlights.com/'));";
+      //       break;
+      //     case 'gm':
+      //       echo "alert(url.replace('/kcfinder/upload/gm/','https://data.chinarundreisen.com/'));";
+      //       break;
+      //     default:
+      //       echo 'alert(url);';
+      //   }
+      //   ?>
+      //   window.KCFinder = null;
+      // };
+      // window.open('/kcfinder/browse.php?type=<?php echo $this->config->item('site_code'); ?>', 'kcfinder_textbox', 'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600');
+
+    }
 
 
-  //快速图片上传
-  function openKCFinder_fast() {
-    window.CallBack = oopenKCFinder_fast_callback;
-    window.open(
-      '/media/popselectpicture.php?site_code=<?php echo $this->config->item('site_code'); ?>&site_lgc=<?php echo $this->config->item('site_lgc'); ?>',
-      'kcfinder_textbox',
-      'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600');
-  }
+    //快速图片上传
+    function openKCFinder_fast() {
+      window.CallBack = oopenKCFinder_fast_callback;
+      window.open(
+        '/media/popselectpicture.php?site_code=<?php echo $this->config->item('site_code'); ?>&site_lgc=<?php echo $this->config->item('site_lgc'); ?>',
+        'kcfinder_textbox',
+        'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600');
+    }
 
-  function oopenKCFinder_fast_callback(result) {
-    var site_image_url = '<?php echo $this->config->item('site_image_url') ?>';
-    if (result != null && result.Pinfo[0]) {
-      $.modaldialog.success("图片地址：<br/>" + site_image_url + result.Pinfo[0].PUrl);
+    function oopenKCFinder_fast_callback(result) {
+      var site_image_url = '<?php echo $this->config->item('site_image_url') ?>';
+      if (result != null && result.Pinfo[0]) {
+        $.modaldialog.success("图片地址：<br/>" + site_image_url + result.Pinfo[0].PUrl);
+      }
+    }
+    //标识所有信息未已读
+    function set_allmsg_to_read(ic_ids) {
+      var url = '<?php echo site_url("author/set_msg_to_read"); ?>';
+      $.post(url, {
+        'msg_ids': ic_ids
+      }, function (result) {
+        window.location.href = window.location.href;
+      });
     }
-  }
-  //标识所有信息未已读
-  function set_allmsg_to_read(ic_ids) {
-    var url = '<?php echo site_url("author/set_msg_to_read"); ?>';
-    $.post(url, {
-      'msg_ids': ic_ids
-    }, function(result) {
-      window.location.href = window.location.href;
-    });
-  }
 
 
-  //选择内容图片
-  function openKCFinder_Content() {
-    var site_url = '<?php echo $this->config->item('site_url') ?>';
-    var weburl = encodeURI(site_url + $("#ic_url").val());
-    window.CallBack = openKCFinder_Content_callback;
-    window.open(
-      '/media/popselectpicture.php?site_code=<?php echo $this->config->item('site_code'); ?>&site_lgc=<?php echo $this->config->item('site_lgc'); ?>&WebUrl=' +
-      weburl, 'kcfinder_textbox',
-      'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600');
-  }
+    //选择内容图片
+    function openKCFinder_Content() {
+      var site_url = '<?php echo $this->config->item('site_url') ?>';
+      var weburl = encodeURI(site_url + $("#ic_url").val());
+      window.CallBack = openKCFinder_Content_callback;
+      window.open(
+        '/media/popselectpicture.php?site_code=<?php echo $this->config->item('site_code'); ?>&site_lgc=<?php echo $this->config->item('site_lgc'); ?>&WebUrl=' +
+        weburl, 'kcfinder_textbox',
+        'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600');
+    }
 
-  function openKCFinder_Content_callback(result) {
-    var site_image_url = '<?php echo $this->config->item('media_image_url') ?>';
-    var use_pictures = $("#use_pictures").val();
-    if (result != null) {
-      for (var key in result.Pinfo) {
-        if ('<?php echo $this->config->item('site_code') ?>' == 'ah') {
-          editor.insertHtml('<div class="infoimage"> <img alt="' + result.Pinfo[key].Sinfo +
-            '" class="img-responsive"  src="' + site_image_url + result.Pinfo[key].PUrl +
-            '"  /> <span class="photoTxt">' + result.Pinfo[key].Sinfo + '</span></div>');
-        } else if ('<?php echo $this->config->item('site_code') ?>' == 'ch') {
-          editor.insertHtml('<div class="infoimage"><img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' +
-            result.Pinfo[key].Sinfo + '" class="img-responsive" width="' + result.Pinfo[key].Width + '" height="' +
-            result.Pinfo[key].Height + '"><span class="infoimagetitle">' + result.Pinfo[key].Sinfo + '</span></div>');
-        } else if ('<?php echo $this->config->item('site_code') ?>' == 'gh') {
-          editor.insertHtml('<div class="infoimage"><img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' +
-            result.Pinfo[key].Sinfo + '" class="img-responsive" width="' + result.Pinfo[key].Width + '" height="' +
-            result.Pinfo[key].Height + '"><span class="infoimagetitle">' + result.Pinfo[key].Sinfo + '</span></div>');
-        } else {
-          editor.insertHtml('<img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key]
-            .PName + '" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '" />');
+    function openKCFinder_Content_callback(result) {
+      var site_image_url = '<?php echo $this->config->item('media_image_url') ?>';
+      var use_pictures = $("#use_pictures").val();
+      if (result != null) {
+        for (var key in result.Pinfo) {
+          if ('<?php echo $this->config->item('site_code') ?>' == 'ah') {
+            editor.insertHtml('<div class="infoimage"> <img alt="' + result.Pinfo[key].Sinfo +
+              '" class="img-responsive"  src="' + site_image_url + result.Pinfo[key].PUrl +
+              '"  /> <span class="photoTxt">' + result.Pinfo[key].Sinfo + '</span></div>');
+          } else if ('<?php echo $this->config->item('site_code') ?>' == 'ch') {
+            editor.insertHtml('<div class="infoimage"><img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' +
+              result.Pinfo[key].Sinfo + '" class="img-responsive" width="' + result.Pinfo[key].Width + '" height="' +
+              result.Pinfo[key].Height + '"><span class="infoimagetitle">' + result.Pinfo[key].Sinfo + '</span></div>');
+          } else if ('<?php echo $this->config->item('site_code') ?>' == 'gh') {
+            editor.insertHtml('<div class="infoimage"><img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' +
+              result.Pinfo[key].Sinfo + '" class="img-responsive" width="' + result.Pinfo[key].Width + '" height="' +
+              result.Pinfo[key].Height + '"><span class="infoimagetitle">' + result.Pinfo[key].Sinfo + '</span></div>');
+          } else {
+            editor.insertHtml('<img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key]
+              .PName + '" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '" />');
+          }
+          use_pictures = use_pictures + result.Pinfo[key].ID + ':' + result.Pinfo[key].PUrl + ':' + result.Pinfo[key].wh +
+            ',';
         }
-        use_pictures = use_pictures + result.Pinfo[key].ID + ':' + result.Pinfo[key].PUrl + ':' + result.Pinfo[key].wh +
-          ',';
+        $("#use_pictures").val(use_pictures);
       }
-      $("#use_pictures").val(use_pictures);
     }
-  }
   </script>
   <script>
-  var _hmt = _hmt || [];
-  (function() {
-    var hm = document.createElement("script");
-    hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
-    var s = document.getElementsByTagName("script")[0];
-    s.parentNode.insertBefore(hm, s);
-  })();
+    var _hmt = _hmt || [];
+    (function () {
+      var hm = document.createElement("script");
+      hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(hm, s);
+    })();
   </script>
 
 </head>
@@ -204,11 +203,11 @@
             <span class="input-group-btn">
               <button class="btn btn-default btn-sm" type="submit">搜索</button>
               <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) { ?>
-              <a href="https://res.chinarundreisen.com/icht-heroes/#/picture-manager/picture-storehouse" target="_blank"
-                class="btn btn-default btn-sm" title="图片上传管理"><span class="glyphicon glyphicon-picture"></span></a>
+                <a href="https://cdn.chinarundreisen.com/icht-heroes/#/picture-manager/picture-storehouse" target="_blank"
+                  class="btn btn-default btn-sm" title="图片上传管理"><span class="glyphicon glyphicon-picture"></span></a>
               <?php } else { ?>
-              <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"><span
-                  class="glyphicon glyphicon-picture"></span></a>
+                <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"><span
+                    class="glyphicon glyphicon-picture"></span></a>
               <?php } ?>
               <a href="#" onclick="openKCFinder_fast();" class="btn btn-default btn-sm" title="多媒体中心"><span
                   class="glyphicon glyphicon-folder-open"></span></a>
@@ -221,79 +220,76 @@
         </form>
         <ul class="nav navbar-nav navbar-right">
           <?php
-                    $all_unread_sms = get_all_unread_sms();
-                    $info_unread_sms = get_all_unread_sms('info');
-                    if (isset($information->ic_id))
-                        $current_msg = $information->ic_id;
-                    if (isset($task->t_id))
-                        $current_msg = $task->t_id;
-                    $total_count = $all_unread_sms['sms_count'] + $info_unread_sms['sms_count']; //计算未读消息总数
-                    $unread_sms_ic_id = 0; //用于设置所有收录消息为已读
-                    if ($total_count != 0) {
-                    ?>
-          <!-- 如果当前页面存在未读消息，则消息数减一 -->
-          <?php
-                        if (isset($current_msg) && isset($all_unread_sms['sms'][$current_msg])) {
-                            $total_count = $total_count - count($all_unread_sms['sms'][$current_msg]);
-                            unset($all_unread_sms['sms'][$current_msg]);
-                        }
-                        ?>
-          <?php
-                        if (isset($current_msg) && isset($info_unread_sms['sms'][$current_msg])) {
-                            $total_count = $total_count - count($info_unread_sms['sms'][$current_msg]);
-                            unset($info_unread_sms['sms'][$current_msg]);
-                        }
-                        ?>
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-              <i class="icon-envelope icon-white pull-left" style="margin-top:3px;"></i> <span
-                class="badge badge-important pull-right"><?php echo $total_count; ?></span>
-            </a>
-            <ul class="dropdown-menu">
-              <!-- 信息平台的消息 -->
-              <?php if (isset($info_unread_sms['sms']) && !empty($info_unread_sms['sms'])) { ?>
-              <a style="padding-left:20px;" href="javascript:void(0);"
-                onclick="set_allmsg_to_read($('#unreadinfomsg').val());">标记全部收录信息为已读</a>
-              <li class="divider"></li>
-              <?php foreach ($info_unread_sms['sms'] as $m) { ?>
-              <li><a
-                  href="<?php echo site_url('information/edit/' . $m[0]->is_id); ?>"><?php
-                                                                                                                    $t_title = get_text_short($m[0]->t_title, 15);
-                                                                                                                    echo '[' . $m[0]->ic_sitecode . '] ' . $t_title['content'] . ' (' . $m[0]->m_content . ')';
-                                                                                                                    ?></a>
-              </li>
-              <?php $unread_sms_ic_id .= ',' . $m[0]->m_object_id; ?>
-              <?php } ?>
-              <li class="divider"></li>
-              <input type="hidden" name="unreadinfomsg" id="unreadinfomsg" value="<?php echo $unread_sms_ic_id; ?>">
-              <?php } ?>
-              <!--作者平台的消息-->
-              <?php foreach ($all_unread_sms['sms'] as $am) { ?>
-              <li><a
-                  href="<?php echo site_url('author/edit_task/' . $am[0]->m_object_id); ?>"><?php
-                                                                                                                        $t_title = get_text_short($am[0]->t_title, 15);
-                                                                                                                        echo $t_title['content'] . ' (' . count($am) . ')';
-                                                                                                                        ?></a>
-              </li>
-              <?php } ?>
-            </ul>
-          </li>
+          $all_unread_sms = get_all_unread_sms();
+          $info_unread_sms = get_all_unread_sms('info');
+          if (isset($information->ic_id))
+            $current_msg = $information->ic_id;
+          if (isset($task->t_id))
+            $current_msg = $task->t_id;
+          $total_count = $all_unread_sms['sms_count'] + $info_unread_sms['sms_count']; //计算未读消息总数
+          $unread_sms_ic_id = 0; //用于设置所有收录消息为已读
+          if ($total_count != 0) {
+            ?>
+            <!-- 如果当前页面存在未读消息，则消息数减一 -->
+            <?php
+            if (isset($current_msg) && isset($all_unread_sms['sms'][$current_msg])) {
+              $total_count = $total_count - count($all_unread_sms['sms'][$current_msg]);
+              unset($all_unread_sms['sms'][$current_msg]);
+            }
+            ?>
+            <?php
+            if (isset($current_msg) && isset($info_unread_sms['sms'][$current_msg])) {
+              $total_count = $total_count - count($info_unread_sms['sms'][$current_msg]);
+              unset($info_unread_sms['sms'][$current_msg]);
+            }
+            ?>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                <i class="icon-envelope icon-white pull-left" style="margin-top:3px;"></i> <span
+                  class="badge badge-important pull-right"><?php echo $total_count; ?></span>
+              </a>
+              <ul class="dropdown-menu">
+                <!-- 信息平台的消息 -->
+                <?php if (isset($info_unread_sms['sms']) && !empty($info_unread_sms['sms'])) { ?>
+                  <a style="padding-left:20px;" href="javascript:void(0);"
+                    onclick="set_allmsg_to_read($('#unreadinfomsg').val());">标记全部收录信息为已读</a>
+                  <li class="divider"></li>
+                  <?php foreach ($info_unread_sms['sms'] as $m) { ?>
+                    <li><a href="<?php echo site_url('information/edit/' . $m[0]->is_id); ?>"><?php
+                         $t_title = get_text_short($m[0]->t_title, 15);
+                         echo '[' . $m[0]->ic_sitecode . '] ' . $t_title['content'] . ' (' . $m[0]->m_content . ')';
+                         ?></a>
+                    </li>
+                    <?php $unread_sms_ic_id .= ',' . $m[0]->m_object_id; ?>
+                  <?php } ?>
+                  <li class="divider"></li>
+                  <input type="hidden" name="unreadinfomsg" id="unreadinfomsg" value="<?php echo $unread_sms_ic_id; ?>">
+                <?php } ?>
+                <!--作者平台的消息-->
+                <?php foreach ($all_unread_sms['sms'] as $am) { ?>
+                  <li><a href="<?php echo site_url('author/edit_task/' . $am[0]->m_object_id); ?>"><?php
+                       $t_title = get_text_short($am[0]->t_title, 15);
+                       echo $t_title['content'] . ' (' . count($am) . ')';
+                       ?></a>
+                  </li>
+                <?php } ?>
+              </ul>
+            </li>
           <?php } ?>
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
               <?php
-                            echo $this->config->item('site_code');
-                            echo ' -';
-                            $admin_info = $this->session->userdata('session_admin');
-                            echo $admin_info['OPI_Name'];
-                            ?>
+              echo $this->config->item('site_code');
+              echo ' -';
+              $admin_info = $this->session->userdata('session_admin');
+              echo $admin_info['OPI_Name'];
+              ?>
               <b class="caret"></b>
             </a>
             <ul class="dropdown-menu">
               <?php foreach ($this->config->item('site') as $site_item) { ?>
-              <li> <a
-                  href="<?php echo site_url('login/change_site/' . $site_item['site_code']); ?>"><?php echo $site_item['site_code'] ?></a>
-              </li>
+                <li> <a href="<?php echo site_url('login/change_site/' . $site_item['site_code']); ?>"><?php echo $site_item['site_code'] ?></a>
+                </li>
               <?php } ?>
               <li><a href="<?php echo site_url('login/out'); ?>">退出</a></li>
             </ul>

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

@@ -349,13 +349,21 @@
 						<input type="checkbox" value="yes" name="contact_via_phone_call" id="Phone" class="checkBorder" >
 						<label for="Phone">Phone call</label>
 					</div> 
+                    <div class="checkYes">
+						<input type="checkbox" value="yes" name="contact_via_email" id="Email" class="checkBorder" >
+						<label for="Email">Email</label>
+					</div> 
                     <div class="checkYes">
 						<input type="checkbox" value="yes" name="contact_via_video_appointment" id="Video" class="checkBorder" >
 						<label for="Video">Video appointment</label>
 					</div> 
    
-   
+   <p style="    clear: both;
+    margin-top: 60px;
+    margin-bottom: -30px; padding: 0;">We require a USD 300 deposit per adult or child charged at adult rates. For single room requests or if traveling with children, please inform us. Additional costs will be added to your balance.</p>
     <button class="sendButton" id="submit_gp_form" type="button">Inquire Now</button>
+    <input name="total_price" id="totalPriceHidden" type="hidden" value="10000" />
+    <input name="payment_required" id="payment_required" type="hidden" value="required" />
     <input name="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/> 
     <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
     </form>
@@ -399,6 +407,16 @@
 			var adultNumberValue = el('adultNumber').value;
 			const plusAdultBtn = el('plusAdult');
 			const minusAdultBtn = el('minusAdult');
+      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++;
@@ -453,6 +471,9 @@
 			const gp_form = el('gp_form');
 			submitFormBtn.on('click', () => {
 				if (validateGPForm()) {
+          var ticketPrice = 300;
+					var totalPrice = calcTotalPrice(ticketPrice, adultNumberValue);
+          totalPriceHidden.value = totalPrice;
 					
 					if (typeof(grecaptcha) === "undefined") {
 						console.warn('grecaptcha is disabled.');

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

@@ -477,6 +477,10 @@ Our must-dos/must-sees are…" style="height:90px;"></textarea>
     <input type="checkbox" value="yes" name="contact_via_phone_call" id="Phone" class="checkBorder" >
     <label for="Phone">Phone call</label>
 </div> 
+<div class="checkYes">
+    <input type="checkbox" value="yes" name="contact_via_email" id="Email" class="checkBorder" >
+    <label for="Email">Email</label>
+</div>
 <div class="checkYes">
     <input type="checkbox" value="yes" name="contact_via_video_appointment" id="Video" class="checkBorder" >
     <label for="Video">Video appointment</label>

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

@@ -537,6 +537,10 @@ margin-bottom: 10px;
     <input type="checkbox" value="yes" name="contact_via_phone_call" id="Phone" class="checkBorder" >
     <label for="Phone">Phone call</label>
 </div> 
+<div class="checkYes">
+    <input type="checkbox" value="yes" name="contact_via_email" id="Email" class="checkBorder" >
+    <label for="Email">Email</label>
+</div>
 <div class="checkYes">
     <input type="checkbox" value="yes" name="contact_via_video_appointment" id="Video" class="checkBorder" >
     <label for="Video">Video appointment</label>

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

@@ -324,6 +324,10 @@
 						<input type="checkbox" value="yes" name="contact_via_phone_call" id="Phone" class="checkBorder" >
 						<label for="Phone">Phone call</label>
 					</div> 
+                    <div class="checkYes">
+						<input type="checkbox" value="yes" name="contact_via_email" id="Email" class="checkBorder" >
+						<label for="Email">Email</label>
+					</div> 
                     <div class="checkYes">
 						<input type="checkbox" value="yes" name="contact_via_video_appointment" id="Video" class="checkBorder" >
 						<label for="Video">Video appointment</label>
@@ -335,8 +339,9 @@
     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>
+    <button class="sendButton" id="submit_gp_form" type="button">Inquire</button>
         <input name="total_price" id="totalPriceHidden" type="hidden" value="10000" />
+        <input name="payment_description" type="hidden" value="Booking Yi Peng Festival Mini-Group Tour" />
     <input name="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/> 
     <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
     </form>

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

@@ -4,7 +4,7 @@
     <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">
+        <div class="selectHotl" style="margin-bottom: 20px;">
             <div class="optionLable">
                 <input type="radio" value="2023-11-27" id="november27th" name="ticket_date">
                 <label for="november27th">
@@ -19,7 +19,7 @@
             </div>
         </div>
         <p style="    font-size: 22px;"><strong>Select Ticket Type</strong></p>
-        <div class="selectHotl">
+        <div class="selectHotl" style="margin-bottom: 20px;">
             <div class="optionLable" id="ticket_type_premium">
                 <input type="radio" value="Premium+Transfer+Dinner" id="Premium" name="ticket_type">
                 <label for="Premium" style="font-size:18px;">
@@ -48,6 +48,7 @@
                 </label>
             </div>
         </div>
+        <p style="display: inline-block;">Premium ticket booking for the 27th is closed. However, we've reserved tickets for those booking our Lantern Festival Tour. We highly recommend our <a href="/thailand/tours/lantern-festival">Lantern Festival Tou</a>r to secure a premium ticket for November 27th.</p>
         <p style="    font-size: 22px;"><strong>Select Quantity</strong></p>
         <div class="peopleSelect" style="width: auto;">
             <span class="formMemo">
@@ -366,6 +367,10 @@
             <input type="checkbox" value="yes" name="contact_via_phone_call" id="Phone" class="checkBorder">
             <label for="Phone">Phone call</label>
         </div>
+        <div class="checkYes">
+            <input type="checkbox" value="yes" name="contact_via_email" id="Email" class="checkBorder">
+            <label for="Email">Email</label>
+        </div>
         <div class="checkYes">
             <input type="checkbox" value="yes" name="contact_via_video_appointment" id="Video" class="checkBorder">
             <label for="Video">Video appointment</label>
@@ -422,14 +427,13 @@
         var ticketDateNode = ticketDateList[i];
         ticketDateNode.addEventListener('click', function (event) {
             var currentTarget = event.currentTarget;
-            // 8 号所有的票卖完了
-            // if (currentTarget.id === 'november8th') {
-            //     ticketTypePremium.style.display = 'none';
-            //     vipTypePremium.style.display = 'none';
-            // } else {
-            //     ticketTypePremium.style.display = '';
-            //     vipTypePremium.style.display = '';
-            // }
+            if (currentTarget.id === 'november27th') {
+                ticketTypePremium.style.display = 'none';
+                // vipTypePremium.style.display = 'none';
+            } else {
+                ticketTypePremium.style.display = '';
+                // vipTypePremium.style.display = '';
+            }
         });
     }
     var plusButton = document.getElementById("plusButton");

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

@@ -3,7 +3,7 @@
     <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">
+		<div class="selectHotl" style="margin-bottom: 20px;">
             <div class="optionLable">
                 <input type="radio" value="2023-11-27" id="november27th" name="ticket_date">
                 <label for="november27th">
@@ -17,8 +17,9 @@
                 </label>
             </div>
         </div>
-        <p style="    font-size: 22px;"><strong>Select Ticket Type</strong></p>
-		<div class="selectHotl">
+        <p style="font-size: 22px;"><strong>Select Ticket Type</strong></p>
+
+		<div class="selectHotl" style="margin-bottom: 20px;">
             <div class="optionLable" id="ticket_type_premium">
                 <input type="radio" value="Premium+Transfer+Dinner" id="Premium" name="ticket_type">
                 <label for="Premium" style="font-size:18px;">
@@ -47,6 +48,7 @@
                 </label>
             </div>
         </div>
+        <p style="display: inline-block;">Premium ticket booking for the 27th is closed. However, we've reserved tickets for those booking our Lantern Festival Tour. We highly recommend our <a href="/thailand/tours/lantern-festival">Lantern Festival Tour</a> to secure a premium ticket for November 27th.</p>
         <p style="    font-size: 22px;"><strong>Select Quantity</strong></p>
         <div class="peopleSelect" style="width: auto;">
             <span class="formMemo">
@@ -360,6 +362,10 @@
     <input type="checkbox" value="yes" name="contact_via_phone_call" id="Phone" class="checkBorder" >
     <label for="Phone">Phone call</label>
 </div> 
+<div class="checkYes">
+    <input type="checkbox" value="yes" name="contact_via_email" id="Email" class="checkBorder" >
+    <label for="Email">Email</label>
+</div> 
 <div class="checkYes">
     <input type="checkbox" value="yes" name="contact_via_video_appointment" id="Video" class="checkBorder" >
     <label for="Video">Video appointment</label>
@@ -416,14 +422,13 @@
         var ticketDateNode = ticketDateList[i];
         ticketDateNode.addEventListener('click', function (event) {
             var currentTarget = event.currentTarget;
-            // 8 号所有的票卖完了
-            // if (currentTarget.id === 'november8th') {
-            //     ticketTypePremium.style.display = 'none';
-            //     vipTypePremium.style.display = 'none';
-            // } else {
-            //     ticketTypePremium.style.display = '';
-            //     vipTypePremium.style.display = '';
-            // }
+            if (currentTarget.id === 'november27th') {
+                ticketTypePremium.style.display = 'none';
+                // vipTypePremium.style.display = 'none';
+            } else {
+                ticketTypePremium.style.display = '';
+                // vipTypePremium.style.display = '';
+            }
         });
     }
     var plusButton = document.getElementById("plusButton");

application/views/mobile_first/ah-next-mobile.php

@@ -0,0 +1,252 @@
+<div class="nextcontext">
+    <?php if(!empty($recommands['Tour A']) || !empty($recommands['Tour B']) || !empty($recommands['Tour C']) || !empty($recommands['Tour D'])){ ?>
+        <h2 class="nexttitle">Get Inspired with Some Popular Itineraries</h2>
+        <p class="nextinfo">At Asia Highlights, we create your kind of journey — your dates, your destinations, at your pace. You can have any trip tailor made for your travel.</p>
+            
+        <?php if(!empty($recommands['Tour A'])){ ?>
+            <div class="nextarticle">
+                <a href="<?php echo $recommands['Tour A']->ic_url; ?>" id="bottom_tour_a_image_mobile"> <img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                     originalsrc="<?php echo $recommands['Tour A']->desktop_photo; ?>"
+                     class="img-responsive" alt="<?php echo $recommands['Tour A']->ic_title; ?>"></a>
+           
+                    <div class="tournextname"><a href="<?php echo $recommands['Tour A']->ic_url; ?>" id="bottom_tour_a_title_mobile"><?php echo $recommands['Tour A']->ic_title; ?></a></div>
+            
+            </div>
+        <?php } ?>
+    
+        
+        <?php if(!empty($recommands['Tour B'])){ ?>
+            <div class="nextarticle">
+                <a href="<?php echo $recommands['Tour B']->ic_url; ?>" id="bottom_tour_b_image_mobile"> <img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                     originalsrc="<?php echo $recommands['Tour B']->desktop_photo; ?>"
+                     class="img-responsive" alt="<?php echo $recommands['Tour B']->ic_title; ?>"></a>
+              
+                    <div class="tournextname"><a href="<?php echo $recommands['Tour B']->ic_url; ?>" id="bottom_tour_b_title_mobile"><?php echo $recommands['Tour B']->ic_title; ?></a></div>
+               
+            </div> 
+        <?php } ?>
+   
+        
+        <?php if(!empty($recommands['Tour C'])){ ?>
+            <div class="nextarticle">
+                <a href="<?php echo $recommands['Tour C']->ic_url; ?>" id="bottom_tour_c_image_mobile"> <img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                     originalsrc="<?php echo $recommands['Tour C']->desktop_photo; ?>"
+                     class="img-responsive" alt="<?php echo $recommands['Tour C']->ic_title; ?>"></a>
+     
+                    <div class="tournextname"><a href="<?php echo $recommands['Tour C']->ic_url; ?>" id="bottom_tour_c_title_mobile"><?php echo $recommands['Tour C']->ic_title; ?></a></div>
+              
+            </div>
+        <?php } ?>
+    
+        
+        <?php if(!empty($recommands['Tour D'])){ ?>
+            <div class="nextarticle">
+                <a href="<?php echo $recommands['Tour D']->ic_url; ?>" id="bottom_tour_d_image_mobile">  <img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                     originalsrc="<?php echo $recommands['Tour D']->desktop_photo; ?>"
+                     class="img-responsive" alt="<?php echo $recommands['Tour D']->ic_title; ?>"></a>
+             
+                    <div class="tournextname"><a href="<?php echo $recommands['Tour D']->ic_url; ?>" id="bottom_tour_d_title_mobile"><?php echo $recommands['Tour D']->ic_title; ?></a></div>
+            
+            </div>
+        <?php } ?>
+
+        
+
+        
+        <?php if(!empty($recommands['Tour E'])){ ?>
+            <div class="nextarticle">
+                <a href="<?php echo $recommands['Tour E']->ic_url; ?>" id="bottom_tour_e_image_mobile"> <img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                     originalsrc="<?php echo $recommands['Tour E']->desktop_photo; ?>"
+                     class="img-responsive" alt="<?php echo $recommands['Tour E']->ic_title; ?>"></a>
+           
+                    <div class="tournextname"><a href="<?php echo $recommands['Tour E']->ic_url; ?>" id="bottom_tour_e_title_mobile"><?php echo $recommands['Tour E']->ic_title; ?></a></div>
+
+               
+            </div>
+        <?php } ?>
+
+        
+
+        
+        <?php if(!empty($recommands['Tour F'])){ ?>
+            <div class="nextarticle">
+                <a href="<?php echo $recommands['Tour F']->ic_url; ?>" id="bottom_tour_f_image_mobile">  <img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                     originalsrc="<?php echo $recommands['Tour F']->desktop_photo; ?>"
+                     class="img-responsive" alt="<?php echo $recommands['Tour F']->ic_title; ?>"></a>
+            
+                    <div class="tournextname"><a href="<?php echo $recommands['Tour F']->ic_url; ?>" id="bottom_tour_f_title_mobile"><?php echo $recommands['Tour F']->ic_title; ?></a></div>
+               
+            </div>
+        <?php } ?>
+
+        
+
+        
+        <?php if(!empty($recommands['Tour G'])){ ?>
+            <div class="nextarticle">
+                <a href="<?php echo $recommands['Tour G']->ic_url; ?>" id="bottom_tour_g_image_mobile">  <img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                     originalsrc="<?php echo $recommands['Tour G']->desktop_photo; ?>"
+                     class="img-responsive" alt="<?php echo $recommands['Tour G']->ic_title; ?>"></a>
+           
+                    <div class="tournextname"><a href="<?php echo $recommands['Tour G']->ic_url; ?>" id="bottom_tour_g_title_mobile"><?php echo $recommands['Tour G']->ic_title; ?></a></div>
+               
+            </div>
+        <?php } ?>
+
+        
+
+        
+        <?php if(!empty($recommands['Tour H'])){ ?>
+            <div class="nextarticle">
+                <a href="<?php echo $recommands['Tour H']->ic_url; ?>" id="bottom_tour_h_image_mobile"><img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                     originalsrc="<?php echo $recommands['Tour H']->desktop_photo; ?>"
+                     class="img-responsive" alt="<?php echo $recommands['Tour H']->ic_title; ?>"></a>
+    
+                    <div class="tournextname"><a href="<?php echo $recommands['Tour H']->ic_url; ?>" id="bottom_tour_h_title_mobile"><?php echo $recommands['Tour H']->ic_title; ?></a></div>
+             
+            </div> 
+        <?php } ?>
+       
+                    
+
+    <?php } ?>
+    
+    <?php if(!empty($recommands['Article A']) || !empty($recommands['Article B']) || !empty($recommands['Article C']) || !empty($recommands['Article D'])){ ?>
+
+    <h2 class="nexttitle">More Travel Ideas and Inspiration</h2>
+
+
+            <?php if(!empty($recommands['Article A'])){ ?>
+        
+    <div class="nextarticle">
+        <a href="<?php echo $recommands['Article A']->ic_url; ?>" id="bottom_info_a_image_mobile">  <img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                    originalsrc="<?php echo $recommands['Article A']->desktop_photo; ?>"
+                    class="img-responsive" alt="<?php echo $recommands['Article A']->ic_title; ?>"></a>
+ 
+            <div class="tournextname">
+                <a href="<?php echo $recommands['Article A']->ic_url; ?>" id="bottom_info_a_title_mobile"> <?php echo $recommands['Article A']->ic_title; ?> </a>
+            </div>
+
+    </div>
+    <?php } ?>
+
+    <?php if(!empty($recommands['Article B'])){ ?>
+        
+        <div class="nextarticle">
+            <a href="<?php echo $recommands['Article B']->ic_url; ?>" id="bottom_info_b_image_mobile"></a> <img
+                        src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $recommands['Article B']->desktop_photo; ?>"
+                        class="img-responsive" alt="<?php echo $recommands['Article B']->ic_title; ?>"></a>
+
+                <div class="tournextname">
+                    <a href="<?php echo $recommands['Article B']->ic_url; ?>" id="bottom_info_b_title_mobile"> <?php echo $recommands['Article B']->ic_title; ?> </a>
+                </div>
+
+
+        </div>
+    <?php } ?>
+
+    <?php if(!empty($recommands['Article C'])){ ?>
+        
+        <div class="nextarticle">
+            <a href="<?php echo $recommands['Article C']->ic_url; ?>" id="bottom_info_c_image_mobile"> <img
+                        src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $recommands['Article C']->desktop_photo; ?>"
+                        class="img-responsive" alt="<?php echo $recommands['Article C']->ic_title; ?>"></a>
+  
+                <div class="tournextname">
+                    <a href="<?php echo $recommands['Article C']->ic_url; ?>" id="bottom_info_c_title_mobile"> <?php echo $recommands['Article C']->ic_title; ?> </a>
+                </div>
+
+   
+        </div>
+    <?php } ?>
+
+    <?php if(!empty($recommands['Article D'])){ ?>
+        
+        <div class="nextarticle">
+            <a href="<?php echo $recommands['Article D']->ic_url; ?>" id="bottom_info_d_image_mobile"> <img
+                        src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $recommands['Article D']->desktop_photo; ?>"
+                        class="img-responsive" alt="<?php echo $recommands['Article D']->ic_title; ?>"></a>
+     
+                <div class="tournextname">
+                    <a href="<?php echo $recommands['Article D']->ic_url; ?>" id="bottom_info_d_title_mobile"> <?php echo $recommands['Article D']->ic_title; ?> </a>
+                </div>
+
+  
+        </div>
+        
+    <?php } ?>
+
+    <?php if(!empty($recommands['Article E'])){ ?>
+        
+        <div class="nextarticle">
+            <a href="<?php echo $recommands['Article E']->ic_url; ?>" id="bottom_info_e_image_mobile">  <img
+                        src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $recommands['Article E']->desktop_photo; ?>"
+                        class="img-responsive" alt="<?php echo $recommands['Article E']->ic_title; ?>"></a>
+      
+                <div class="tournextname">
+                    <a href="<?php echo $recommands['Article E']->ic_url; ?>" id="bottom_info_e_title_mobile"> <?php echo $recommands['Article E']->ic_title; ?> </a>
+                </div>
+
+     
+        </div>
+        
+    <?php } ?>
+
+    <?php if(!empty($recommands['Article F'])){ ?>
+        
+        <div class="nextarticle">
+            <a href="<?php echo $recommands['Article F']->ic_url; ?>" id="bottom_info_f_image_mobile">  <img
+                        src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $recommands['Article F']->desktop_photo; ?>"
+                        class="img-responsive" alt="<?php echo $recommands['Article F']->ic_title; ?>"></a>
+        
+                <div class="tournextname">
+                    <a href="<?php echo $recommands['Article F']->ic_url; ?>" id="bottom_info_f_title_mobile"> <?php echo $recommands['Article F']->ic_title; ?> </a>
+                </div>
+
+       
+        </div>
+        
+    <?php } ?>
+
+    <?php if(!empty($recommands['Article G'])){ ?>
+        
+        <div class="nextarticle">
+            <a href="<?php echo $recommands['Article G']->ic_url; ?>" id="bottom_info_g_image_mobile">  <img
+                        src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $recommands['Article G']->desktop_photo; ?>"
+                        class="img-responsive" alt="<?php echo $recommands['Article G']->ic_title; ?>"></a>
+   
+                <div class="tournextname">
+                    <a href="<?php echo $recommands['Article G']->ic_url; ?>" id="bottom_info_g_title_mobile"> <?php echo $recommands['Article G']->ic_title; ?> </a>
+                </div>
+       
+        </div>
+        
+    <?php } ?>
+
+    <?php if(!empty($recommands['Article H'])){ ?>
+        
+        <div class="nextarticle">
+            <a href="<?php echo $recommands['Article H']->ic_url; ?>" id="bottom_info_h_image_mobile"> <img
+                        src="https://data.asiahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $recommands['Article H']->desktop_photo; ?>"
+                        class="img-responsive" alt="<?php echo $recommands['Article H']->ic_title; ?>"></a>
+
+                <div class="tournextname">
+                    <a href="<?php echo $recommands['Article H']->ic_url; ?>" id="bottom_info_h_title_mobile"> <?php echo $recommands['Article H']->ic_title; ?> </a>
+                </div>
+      
+        </div>
+        
+    <?php } ?>
+            
+    <?php } ?>
+
+
+
+</div>

application/views/mobile_first/ah-tour-list-form.php

@@ -485,6 +485,10 @@
 					<input type="checkbox" value="yes" name="contact_via_phone_call" id="Phone" class="checkBorder" style="width:auto !important">
 					<label for="Phone">Phone call</label>
 				</div>
+        <div class="checkYes">
+					<input type="checkbox" value="yes" name="contact_via_email" id="Email" class="checkBorder" style="width:auto !important">
+					<label for="Email">Email</label>
+				</div>
 				<div class="checkYes">
 					<input type="checkbox" value="yes" name="contact_via_video_appointment" id="Video" class="checkBorder" style="width:auto !important">
 					<label for="Video">Video appointment</label>

application/views/mobile_first/ch-info-page-form.php

@@ -480,6 +480,7 @@
                       <div class="checkYes"><label for="WeChat"><input class="checkBorder" id="WeChat" name="contact_via_WeChat" type="checkbox" value="yes">WeChat</label></div>
                       <div class="checkYes"><label for="WhatsApp"><input class="checkBorder" id="WhatsApp" name="contact_via_WhatsApp" type="checkbox" value="yes">WhatsApp </label></div>
                       <div class="checkYes"><label for="Phone"><input class="checkBorder" id="Phone" name="contact_via_phone_call" type="checkbox" value="yes">Phone call</label></div>
+                      <div class="checkYes"><label for="Email"><input class="checkBorder" id="Email" name="contact_via_email" type="checkbox" value="yes">Email</label></div>
                       <div class="checkYes"><label for="video"><input class="checkBorder" id="video" name="contact_via_video_appointment" type="checkbox" value="yes">Video appointment</label></div>
             <input type="hidden" name="nullemail">
             <input name="product_code" type="hidden" value="YDFW"/>

application/views/mobile_first/ch-inquiry-form.php

@@ -424,6 +424,7 @@ margin-bottom: -25px;
                       <div class="checkYes"><label for="WeChat"><input class="checkBorder" id="WeChat" name="contact_via_WeChat" type="checkbox" value="yes">WeChat</label></div>
                       <div class="checkYes"><label for="WhatsApp"><input class="checkBorder" id="WhatsApp" name="contact_via_WhatsApp" type="checkbox" value="yes">WhatsApp </label></div>
                       <div class="checkYes"><label for="Phone"><input class="checkBorder" id="Phone" name="contact_via_phone_call" type="checkbox" value="yes">Phone call</label></div>
+                      <div class="checkYes"><label for="Email"><input class="checkBorder" id="Email" name="contact_via_email" type="checkbox" value="yes">Email</label></div>
                       <div class="checkYes"><label for="video"><input class="checkBorder" id="video" name="contact_via_video_appointment" type="checkbox" value="yes">Video appointment</label></div>
             <input type="hidden" name="nullemail">
             <input name="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/>

application/views/mobile_first/ch.php

@@ -72,12 +72,10 @@
           src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png">
       </form>
     </div>
-
-
     <button class="action action--close" aria-label="Close Menu"><svg class="icon icon--cross" id="close"
         aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="52" height="52" viewBox="0 0 52 52"
-        style="width: 20px; height: 20px;">
-        <g stroke-width="6" stroke="#fff">
+        style="width: 20px;height: 20px;">
+        <g stroke-width="6" stroke="#000">
           <line x1="26" x2="4" y1="26" y2="4"></line>
           <line x1="26" x2="48" y2="4" y1="26"></line>
           <line x1="26" x2="2" y1="26" y2="48"></line>

application/views/mobile_first/gh-feedback-city-list.php

@@ -1,7 +1,6 @@
 
-                    <!-- Bangkok -->
-                   
-                    <h2 id="thailand">Thailand Travel Reviews</h2>
+                    <!-- Bangkok -->                 
+                    
                     <?php if (!empty($Bangkok)) {?>
                     <?php foreach ($Bangkok as $index => $feedback) {?>
                     <div class="feedback_content">
@@ -15,7 +14,7 @@
 
                     <!-- Vietnam -->
                 
-                    <h2 id="vietnam">Vietnam Travel Reviews</h2>
+                    
                     <?php if (!empty($Hanoi)) {?>
                     <?php foreach ($Hanoi as $index => $feedback) {?>
                     <div class="feedback_content">
@@ -29,7 +28,7 @@
 
                     <!-- Cambodia -->
                   
-                    <h2 id="cambodia">Cambodia Travel Reviews</h2>
+                   
                     <?php if (!empty($Siem_Reap)) {?>
                       <?php foreach ($Siem_Reap as $index => $feedback) {?>
                       <div class="feedback_content">
@@ -43,7 +42,7 @@
 
                     <!-- Japan -->
                   
-                    <h2 id="japan">Japan Travel Reviews</h2>
+                   
                     <?php if (!empty($Tokyo)) {?>
                     <?php foreach ($Tokyo as $index => $feedback) {?>
                     <div class="feedback_content">
@@ -55,24 +54,10 @@
                     <?php }?>
                     <?php }?>                     
                       
-                      <!-- India 
-                      
-                      <h2 id="india">India Travel Reviews</h2>
-                    <?php if (!empty($Delhi)) {?>
-                      <?php foreach ($Delhi as $index => $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 class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
-                      </div>
-                      <?php }?><div class="more_tours"><a href="/reviews/india">More India reviews</a></div> 
-                      <?php }?>                       
-                        -->
                         
                         <!-- Myanmar -->
                       
-                        <h2 id="myanmar">Myanmar Travel Reviews</h2>
+                        
                     <?php if (!empty($Yangon)) {?>
                       <?php foreach ($Yangon as $index => $feedback) {?>
                       <div class="feedback_content">
@@ -86,7 +71,7 @@
 
                         <!-- China -->
                         
-                        <h2 id="china">China Travel Reviews</h2>
+                      
                     <?php if (!empty($Beijing)) {?>
                       <?php foreach ($Beijing as $index => $feedback) {?>
                       <div class="feedback_content">

application/views/mobile_first/gh-info-page-form.php

@@ -486,18 +486,21 @@
 }">I prefer to
                             be contacted via:</p>
                         <div class="checkYes" style="color:#000;"> <label for="contact whatsapp"><input
-                                    class="checkBorder mgr-primary" id="contact whatsapp" name="contact_via_WhatsApp"
+                                    class="checkBorder " id="contact whatsapp" name="contact_via_WhatsApp"
                                     type="checkbox" value="yes" style="width:auto !important;">WhatsApp</label>
                         </div>
                         <div class="checkYes" style="color:#000;"> <label for="contact iMessage"><input
-                                    class="checkBorder mgr-primary" id="contact iMessage" name="contact_via_iMessage"
+                                    class="checkBorder " id="contact iMessage" name="contact_via_iMessage"
                                     type="checkbox" value="yes" style="width:auto !important;">iMessage</label>
                         </div>
                         <div class="checkYes" style="color:#000;"> <label for="contact Phone"><input
-                                    class="checkBorder mgr-primary" id="contact Phone" name="contact_via_phone_call"
+                                    class="checkBorder " id="contact Phone" name="contact_via_phone_call"
                                     type="checkbox" value="yes" style="width:auto !important;">Phone call</label></div>
+                                    <div class="checkYes" style="color:#000;"> <label for="Email"><input
+                                    class="checkBorder " id="Email" name="contact_via_email"
+                                    type="checkbox" value="yes" style="width:auto !important;">Email</label></div>
                         <div class="checkYes" style="color:#000;"> <label for="contact Video"><input
-                                    class="checkBorder mgr-primary" id="contact Video" name="contact_via_video_appointment"
+                                    class="checkBorder " id="contact Video" name="contact_via_video_appointment"
                                     type="checkbox" value="yes" style="width:auto !important;">Video appointment</label></div>
             
             <input name="nullemail" placeholder="Your alternative email?" type="hidden">

application/views/mobile_first/gh-pc.php

@@ -491,29 +491,6 @@
     <script src="https://data.globalhighlights.com/js/swiper-bundle-7.0.9.min.js"></script>
     <script src="https://data.globalhighlights.com/js/flatpickr-v4.6.11.min.js"></script>
     <script>
-        ((doc, buttonId, contentId, lastContentId) => {
-            doc.addEventListener('DOMContentLoaded', () => {
-                var moreButton = doc.getElementById(buttonId);
-                var contentDiv = doc.getElementById(contentId);
-                var lastContentDiv = doc.getElementById(lastContentId);
-                if (moreButton === null || contentDiv === null || lastContentDiv === null) {
-                    console.warn('CHECK MORE config error');
-                    return;
-                }
-                moreButton.addEventListener('click', () => {
-                    moreButton.classList.add('gh-animate-fade-out');
-                    setTimeout(() => {
-                        moreButton.classList.add('gh-display-none');
-                    }, 80);
-                    contentDiv.classList.remove('gh-display-none');
-                    lastContentDiv.classList.add('normal_content');
-                    setTimeout(() => {
-                        contentDiv.classList.remove('gh-animate-slide-down');
-                        contentDiv.classList.add('gh-animate-slide-up');
-                    }, 0);
-                });
-            });
-        })(document, 'checkMoreButton', 'moreContentDiv', 'lastContentDiv');
         document.addEventListener('DOMContentLoaded', () => {
             flatpickr("#starting_date", {
                 dateFormat: "Y-m-d",
@@ -524,7 +501,6 @@
             });
         });
 
-
         document.addEventListener('DOMContentLoaded', () => {
             var submitbutton = document.getElementById("submit_newsletter");
             var newsletterForm = document.getElementById("newsletter_form");

application/views/mobile_first/gh-tour-form.php

@@ -439,12 +439,13 @@
           efficiency.</p>
           <p style="margin-top: 0;margin-bottom: 10px;padding: 0;color: #000;font-size: 20px;">I prefer to
           be contacted via:</p>
-          <div class="checkYes" style="color:#000;"> <label for="whatsapp"><input class="checkBorder mgr-primary" id="whatsapp" name="contact_via_WhatsApp" type="checkbox" value="yes" style="width:auto !important;">WhatsApp</label>
+          <div class="checkYes" style="color:#000;"> <label for="whatsapp"><input class="checkBorder " id="whatsapp" name="contact_via_WhatsApp" type="checkbox" value="yes" style="width:auto !important;">WhatsApp</label>
         </div>
-        <div class="checkYes" style="color:#000;"> <label for="iMessage"><input class="checkBorder mgr-primary" id="iMessage" name="contact_via_iMessage" type="checkbox" value="yes" style="width:auto !important;">iMessage</label>
+        <div class="checkYes" style="color:#000;"> <label for="iMessage"><input class="checkBorder " id="iMessage" name="contact_via_iMessage" type="checkbox" value="yes" style="width:auto !important;">iMessage</label>
       </div>
-      <div class="checkYes" style="color:#000;"> <label for="Phone"><input class="checkBorder mgr-primary" id="Phone" name="contact_via_phone_call" type="checkbox" value="yes" style="width:auto !important;">Phone call</label></div>
-      <div class="checkYes" style="color:#000;"> <label for="Video"><input class="checkBorder mgr-primary" id="Video" name="contact_via_video_appointment" type="checkbox" value="yes" style="width:auto !important;">Video appointment</label></div>
+      <div class="checkYes" style="color:#000;"> <label for="Phone"><input class="checkBorder " id="Phone" name="contact_via_phone_call" type="checkbox" value="yes" style="width:auto !important;">Phone call</label></div>
+      <div class="checkYes" style="color:#000;"> <label for="Email"><input class="checkBorder " id="Email" name="contact_via_email" type="checkbox" value="yes" style="width:auto !important;">Email</label></div>
+      <div class="checkYes" style="color:#000;"> <label for="Video"><input class="checkBorder " id="Video" name="contact_via_video_appointment" type="checkbox" value="yes" style="width:auto !important;">Video appointment</label></div>
       <input name="nullemail" placeholder="Your alternative email?" type="hidden">
       <input name="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/>
       <button class="sendButton" id="tourFormBtn" type="button">

application/views/mobile_first/gh.php

@@ -478,29 +478,6 @@
   <script src="https://data.globalhighlights.com/js/swiper-bundle-7.0.9.min.js"></script>
   <script src="https://data.globalhighlights.com/js/flatpickr-v4.6.11.min.js"></script>
   <script>
-    ((doc, buttonId, contentId, lastContentId) => {
-      doc.addEventListener('DOMContentLoaded', () => {
-        var moreButton = doc.getElementById(buttonId);
-        var contentDiv = doc.getElementById(contentId);
-        var lastContentDiv = doc.getElementById(lastContentId);
-        if (moreButton === null || contentDiv === null || lastContentDiv === null) {
-          console.warn('CHECK MORE config error');
-          return;
-        }
-        moreButton.addEventListener('click', () => {
-          moreButton.classList.add('gh-animate-fade-out');
-          setTimeout(() => {
-            moreButton.classList.add('gh-display-none');
-          }, 80);
-          contentDiv.classList.remove('gh-display-none');
-          lastContentDiv.classList.add('normal_content');
-          setTimeout(() => {
-            contentDiv.classList.remove('gh-animate-slide-down');
-            contentDiv.classList.add('gh-animate-slide-up');
-          }, 0);
-        });
-      });
-    })(document, 'checkMoreButton', 'moreContentDiv', 'lastContentDiv');
     document.addEventListener('DOMContentLoaded', () => {
       flatpickr("#starting_date", {
         dateFormat: "Y-m-d",