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

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

@@ -21,39 +21,38 @@
         sitecode: '<?php echo $this->config->item('site_code'); ?>',
         width: 1024,
         height: 800,
-      onInit: function(finder) {
+        onInit: function (finder) {
-        finder.on('files:choose', function(evt) {
+          finder.on('files:choose', function (evt) {
             var file = evt.data.files.first();
             alert(file.getUrl());
           });
 
-        finder.on('file:choose:resizedImage', function(evt) {
+          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');
+
     }
 
 
@@ -77,7 +76,7 @@
       var url = '<?php echo site_url("author/set_msg_to_read"); ?>';
       $.post(url, {
         'msg_ids': ic_ids
-    }, function(result) {
+      }, function (result) {
         window.location.href = window.location.href;
       });
     }
@@ -124,7 +123,7 @@
   </script>
   <script>
     var _hmt = _hmt || [];
-  (function() {
+    (function () {
       var hm = document.createElement("script");
       hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
       var s = document.getElementsByTagName("script")[0];
@@ -204,7 +203,7 @@
             <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"
+                <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
@@ -256,8 +255,7 @@
                     onclick="set_allmsg_to_read($('#unreadinfomsg').val());">标记全部收录信息为已读</a>
                   <li class="divider"></li>
                   <?php foreach ($info_unread_sms['sms'] as $m) { ?>
-              <li><a
+                    <li><a href="<?php echo site_url('information/edit/' . $m[0]->is_id); ?>"><?php
-                  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>
@@ -269,8 +267,7 @@
                 <?php } ?>
                 <!--作者平台的消息-->
                 <?php foreach ($all_unread_sms['sms'] as $am) { ?>
-              <li><a
+                  <li><a href="<?php echo site_url('author/edit_task/' . $am[0]->m_object_id); ?>"><?php
-                  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>
@@ -291,8 +288,7 @@
             </a>
             <ul class="dropdown-menu">
               <?php foreach ($this->config->item('site') as $site_item) { ?>
-              <li> <a
+                <li> <a href="<?php echo site_url('login/change_site/' . $site_item['site_code']); ?>"><?php echo $site_item['site_code'] ?></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>

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

@@ -341,6 +341,7 @@
 ">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">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/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.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",