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

hotfix/paypal-note
candice 2 years ago
commit d14a1f2c87

@ -139,7 +139,7 @@
value="<?php echo isset($keywords) ? $keywords : false; ?>"> value="<?php echo isset($keywords) ? $keywords : false; ?>">
<button class="btn">搜索</button> <button class="btn">搜索</button>
<?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) { ?> <?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> class="btn" title="图片上传管理"><i class="icon-picture"></i></a>
<?php } else { ?> <?php } else { ?>
<a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"><i <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"><i

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

@ -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> ">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> <button class="sendButton" id="submit_gp_form" type="button">Inquire</button>
<input name="total_price" id="totalPriceHidden" type="hidden" value="10000" /> <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="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/>
<input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" /> <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
</form> </form>

@ -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/swiper-bundle-7.0.9.min.js"></script>
<script src="https://data.globalhighlights.com/js/flatpickr-v4.6.11.min.js"></script> <script src="https://data.globalhighlights.com/js/flatpickr-v4.6.11.min.js"></script>
<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', () => { document.addEventListener('DOMContentLoaded', () => {
flatpickr("#starting_date", { flatpickr("#starting_date", {
dateFormat: "Y-m-d", dateFormat: "Y-m-d",
@ -524,7 +501,6 @@
}); });
}); });
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
var submitbutton = document.getElementById("submit_newsletter"); var submitbutton = document.getElementById("submit_newsletter");
var newsletterForm = document.getElementById("newsletter_form"); var newsletterForm = document.getElementById("newsletter_form");

@ -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/swiper-bundle-7.0.9.min.js"></script>
<script src="https://data.globalhighlights.com/js/flatpickr-v4.6.11.min.js"></script> <script src="https://data.globalhighlights.com/js/flatpickr-v4.6.11.min.js"></script>
<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', () => { document.addEventListener('DOMContentLoaded', () => {
flatpickr("#starting_date", { flatpickr("#starting_date", {
dateFormat: "Y-m-d", dateFormat: "Y-m-d",

Loading…
Cancel
Save