Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
hotfix/paypal-note
赵鹏 2 years ago
parent e8460da391 d6d5c9632c
commit ee8d5191f3
3 changed files with 741 additions and 738 deletions
Show Stats Download Patch File Download Diff File

76
application/views/bootstrap3/information_edit.php
Unescape Escape View File

@ -782,32 +782,6 @@ if (!empty($setting_website_nav)) {
</div> </div>
</div> </div>
<div>
<div class="col-sm-8">
<label>附加图片PC
<a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
<a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
</label>
<input name="meta_addon_picture" id="meta_addon_picture" type="text" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_addon_picture'); ?>" />
</div>
<div class="col-sm-8">
<label>附加图片Mobile
<a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_mobile', $('#meta_addon_picture_mobile').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
<a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_mobile', $('#meta_addon_picture_mobile').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
</label>
<input name="meta_addon_picture_mobile" id="meta_addon_picture_mobile" type="text" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_addon_picture_mobile'); ?>" />
</div>
<div class="col-sm-8" style="display: none">
<label>附加图片链接
<a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
<a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
</label>
<input name="meta_addon_picture_url" id="meta_addon_picture_url" type="text" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_addon_picture_url'); ?>" />
</div>
</div>
<?php if ($information->ic_sitecode == 'chinatravel') { <?php if ($information->ic_sitecode == 'chinatravel') {
?> ?>
<div> <div>
@ -959,9 +933,7 @@ if (!empty($setting_website_nav)) {
<label><a href="javascript:void(0);" onclick="$('#customize').toggle();">自定义选项</a>　</label> <label><a href="javascript:void(0);" onclick="$('#customize').toggle();">自定义选项</a>　</label>
<?php if ($information->ic_sitecode == "trippest") {?> <?php if ($information->ic_sitecode == "trippest") {?>
<label><a class="btn default" data-toggle="modal" id="aBokunData"> 管理TPBokun数据 </a> </label> <label><a class="btn default" data-toggle="modal" id="aBokunData"> 管理TPBokun数据 </a> </label>
<?php }?> <?php }?>
<label><a class="btn default" data-toggle="modal" id="btnFeedback">TA/TP反馈标签</a>　</label>
<label><a class="btn default" data-toggle="modal" id="btnFormTag">Inquiry表单标签</a>　</label>
<label><a class="btn default" data-toggle="modal" id="btnTemplate">特殊代码模板</a>　</label> <label><a class="btn default" data-toggle="modal" id="btnTemplate">特殊代码模板</a>　</label>
</div> </div>
@ -1830,23 +1802,28 @@ $meta_subnavi_arr = array(
<div class="col-sm-4 well info-right-col" style="height:1004px;padding:0 12px;border:none;"> <div class="col-sm-4 well info-right-col" style="height:1004px;padding:0 12px;border:none;">
<!-- 右侧栏 --> <!-- 右侧栏 -->
<?php
if (stripos($information->ic_photo, '//') === false) {
$list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg';
} else {
$list_picture = $information->ic_photo;
}
?>
<label>标题图片</label>
<input class="form-control" type="text" name="ic_photo" id="ic_photo" value="<?php echo $information->ic_photo; ?>" />
<label>标题图片<a href="javascript:void(0);" onclick="delete_root_image();" title="删除图片"><i class="text-muted glyphicon glyphicon-remove"></i></a></label> <label>附加图片PC
<a href="javascript:void(0);" onclick="openKCFinder_Root();"> <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
<?php <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
if (stripos($information->ic_photo, '//') === false) { </label>
$list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg'; <input name="meta_addon_picture" id="meta_addon_picture" type="text" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_addon_picture'); ?>" />
} else {
$list_picture = $information->ic_photo;
}
?>
<img src="<?php echo $list_picture; ?>" name="ic_photo_img" id="ic_photo_img" class="img-polaroid col-xs-24 nopadding" height="115" />
</a>
<div class="clearfix"></div> <label>附加图片Mobile
<a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_mobile', $('#meta_addon_picture_mobile').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
<a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_mobile', $('#meta_addon_picture_mobile').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
</label>
<input name="meta_addon_picture_mobile" id="meta_addon_picture_mobile" type="text" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_addon_picture_mobile'); ?>" />
<label>图片地址</label>
<input class="form-control" type="text" name="ic_photo" id="ic_photo" value="<?php echo $information->ic_photo; ?>" />
<div class="clearfix"></div> <div class="clearfix"></div>
<div id="bind_product_code"> <div id="bind_product_code">
@ -1877,6 +1854,13 @@ if (stripos($information->ic_photo, '//') === false) {
</div> </div>
</div> </div>
<div id="bind_product_code">
<div class="input-group">
<a class="btn default" data-toggle="modal" id="btnFeedback">TA/TP反馈标签</a>
<a class="btn default" data-toggle="modal" id="btnFormTag">Inquiry表单标签</a>
</div>
</div>
<div id="bind_product_code"> <div id="bind_product_code">
<div class="input-group"> <div class="input-group">
<label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;"> <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
@ -2125,7 +2109,11 @@ foreach ($author_list as $author_item) {
</div> </div>
<div class="modal-body" style="height:650px;"> <div class="modal-body" style="height:650px;">
<label> <label>
Inquiry表单：&lt;--@INFO-PAGE-FORM@--&gt; Inquiry表单：&lt;!--@INFO-PAGE-FORM@--&gt;
</label>
<br>
<label>
CH需要在底部附加样式添加https://data.chinahighlights.com/css/tour-detail-former.css
</label> </label>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">

206
application/views/mobile_first/ah-info-page-form.php
Unescape Escape View File

@ -6,8 +6,9 @@
<h3 style="text-align: center; font-size: 20px; line-height: 22px;">Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.</h3> <h3 style="text-align: center; font-size: 20px; line-height: 22px;">Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.</h3>
<form action="/orders/quick_inquiry_save" method="post" novalidate="" id="info_page_form"> <form action="/orders/quick_inquiry_save" method="post" novalidate="" id="info_page_form">
<textarea id="form_additionalrequirements" name="additional_requirements" placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)" style="height:100px;"></textarea> <textarea id="form_additionalrequirements" name="additional_requirements" placeholder="E.g.:
This is a big trip for: birthday, anniversary, honeymoon, retirement, kid's graduation, bucket list..." style="height:70px;"></textarea>
<!--
<div class="selectionBlock"> <div class="selectionBlock">
<h4> <h4>
Number in your group Number in your group
@ -138,7 +139,7 @@
</div> </div>
</div> </div>
-->
<input class="FullName" id="realname" name="name" placeholder="Your name *" required="" type="text" value="" /> <input class="FullName" id="realname" name="name" placeholder="Your name *" required="" type="text" value="" />
<div id="realname_errmsg" style="display: none"> <div id="realname_errmsg" style="display: none">
<div class="requiredArea" style="margin-top:-10px;">Please enter your name</div> <div class="requiredArea" style="margin-top:-10px;">Please enter your name</div>
@ -151,11 +152,12 @@
<div id="email_verify_errmsg" style="display: none"> <div id="email_verify_errmsg" style="display: none">
<div class="requiredArea" style="margin-top:-10px;">Please verify your email</div> <div class="requiredArea" style="margin-top:-10px;">Please verify your email</div>
</div> </div>
<!--
<input class="InquiryCalendar" id="starting_date" name="date_start" placeholder="Starting date *" readonly="readonly" /> <input class="InquiryCalendar" id="starting_date" name="date_start" placeholder="Starting date *" readonly="readonly" />
<div id="starting_date_errmsg" style="display: none"> <div id="starting_date_errmsg" style="display: none">
<div class="requiredArea" style="margin-top:-10px;">Please enter your starting date</div> <div class="requiredArea" style="margin-top:-10px;">Please enter your starting date</div>
</div> </div>
-->
<select name="country_code" class="country_code"> <select name="country_code" class="country_code">
<option style="font-weight: 600;" value="United States +1">United States&nbsp; &nbsp;+1 <option style="font-weight: 600;" value="United States +1">United States&nbsp; &nbsp;+1
</option> </option>
@ -422,7 +424,8 @@
<input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number (We'll only call if you ask.) *" type="tel" value="" /> <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number (We'll only call if you ask.) *" type="tel" value="" />
<div id="contact_errmsg" style="display: none"> <div id="contact_errmsg" style="display: none">
<div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div> <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
<p style="font-size: 17px; <!--
<p style="font-size: 17px;
color: #555; color: #555;
margin-top: -10px; margin-top: -10px;
margin-bottom: 5px; margin-bottom: 5px;
@ -430,11 +433,8 @@
padding-left: 0; padding-left: 0;
line-height: 20px; line-height: 20px;
">Having a phone number, especially with WhatsApp/iMessage capability will improve communication efficiency.</p> ">Having a phone number, especially with WhatsApp/iMessage capability will improve communication efficiency.</p>
<p style=" -->
margin-top: 0; <p style="margin-top: 0;margin-bottom: 5px;padding: 0;">I prefer to be contacted via:</p>
margin-bottom: 10px;
padding: 0;
">I prefer to be contacted via:</p>
<div class="checkYes"> <div class="checkYes">
<input type="checkbox" value="yes" name="contact_via_whatsapp" id="whatsapp" class="checkBorder" > <input type="checkbox" value="yes" name="contact_via_whatsapp" id="whatsapp" class="checkBorder" >
<label for="whatsapp">WhatsApp</label> <label for="whatsapp">WhatsApp</label>
@ -507,34 +507,34 @@ function validateQuickInquiryForm() {
var result = true; var result = true;
var realnameVal = document.getElementById("realname").value; var realnameVal = document.getElementById("realname").value;
var emailVal = document.getElementById("email").value; var emailVal = document.getElementById("email").value;
var startingDateVal = document.getElementById("starting_date").value; // var startingDateVal = document.getElementById("starting_date").value;
var contactVal = document.getElementById("PhoneNo").value; var contactVal = document.getElementById("PhoneNo").value;
var realnameErrEl = document.getElementById("realname_errmsg"); var realnameErrEl = document.getElementById("realname_errmsg");
var emailErrEl = document.getElementById("email_errmsg"); var emailErrEl = document.getElementById("email_errmsg");
var emailVerifyErrEl = document.getElementById("email_verify_errmsg"); var emailVerifyErrEl = document.getElementById("email_verify_errmsg");
var startingDateErrEl = document.getElementById("starting_date_errmsg"); // var startingDateErrEl = document.getElementById("starting_date_errmsg");
var contactErrEl = document.getElementById("contact_errmsg"); var contactErrEl = document.getElementById("contact_errmsg");
var groupErrEl = document.getElementById("group_error_msg"); // var groupErrEl = document.getElementById("group_error_msg");
realnameErrEl.style.display = 'none'; realnameErrEl.style.display = 'none';
emailErrEl.style.display = 'none'; emailErrEl.style.display = 'none';
emailVerifyErrEl.style.display = 'none'; emailVerifyErrEl.style.display = 'none';
startingDateErrEl.style.display = 'none'; // startingDateErrEl.style.display = 'none';
contactErrEl.style.display = 'none'; contactErrEl.style.display = 'none';
groupErrEl.style.display = 'none'; // groupErrEl.style.display = 'none';
var travel_group_is_checked = false; // var travel_group_is_checked = false;
document.querySelectorAll('input[name="travel_group"]').forEach(function(groupNode) { // document.querySelectorAll('input[name="travel_group"]').forEach(function(groupNode) {
if (groupNode.checked) { // if (groupNode.checked) {
travel_group_is_checked = true; // travel_group_is_checked = true;
} // }
}); // });
if (travel_group_is_checked === false) { // if (travel_group_is_checked === false) {
groupErrEl.style.display = ''; // groupErrEl.style.display = '';
result = false; // result = false;
} // }
if (realnameVal === '') { if (realnameVal === '') {
realnameErrEl.style.display = ''; realnameErrEl.style.display = '';
@ -550,10 +550,10 @@ function validateQuickInquiryForm() {
result = false; result = false;
} }
} }
if (startingDateVal === '') { // if (startingDateVal === '') {
startingDateErrEl.style.display = ''; // startingDateErrEl.style.display = '';
result = false; // result = false;
} // }
if (contactVal === '') { if (contactVal === '') {
contactErrEl.style.display = ''; contactErrEl.style.display = '';
result = false; result = false;
@ -564,82 +564,82 @@ function validateQuickInquiryForm() {
<script> <script>
var $adultBlock = $('#adultBlock'); // var $adultBlock = $('#adultBlock');
var $childrenBlock = $('#childrenBlock'); // var $childrenBlock = $('#childrenBlock');
var $adultNumberInput = $('#adultNumber'); // var $adultNumberInput = $('#adultNumber');
var adultNumber = $adultNumberInput.val(); // var adultNumber = $adultNumberInput.val();
var $teenagerNumberInput = $('#teenagerNumber'); // var $teenagerNumberInput = $('#teenagerNumber');
var teenagerNumber = $teenagerNumberInput.val(); // var teenagerNumber = $teenagerNumberInput.val();
var $childrenNumberInput = $('#childrenNumber'); // var $childrenNumberInput = $('#childrenNumber');
var childrenNumber = $childrenNumberInput.val(); // var childrenNumber = $childrenNumberInput.val();
var $infantNumberInput = $('#infantNumber'); // var $infantNumberInput = $('#infantNumber');
var infantNumber = $infantNumberInput.val(); // var infantNumber = $infantNumberInput.val();
$('input[name="travel_group"]').each((i, groupEle) => { // $('input[name="travel_group"]').each((i, groupEle) => {
$(groupEle).click(function (e) { // $(groupEle).click(function (e) {
$teenagerNumberInput.val(0); // $teenagerNumberInput.val(0);
$childrenNumberInput.val(0); // $childrenNumberInput.val(0);
$infantNumberInput.val(0); // $infantNumberInput.val(0);
var currentTarget = e.currentTarget; // var currentTarget = e.currentTarget;
if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) { // if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) {
$adultBlock.show(); // $adultBlock.show();
$childrenBlock.show(); // $childrenBlock.show();
} else { // } else {
$adultBlock.show(); // $adultBlock.show();
$childrenBlock.hide(); // $childrenBlock.hide();
} // }
if (currentTarget.id === 'Couple') { // if (currentTarget.id === 'Couple') {
$adultNumberInput.val(2); // $adultNumberInput.val(2);
} else if (currentTarget.id === 'Solo') { // } else if (currentTarget.id === 'Solo') {
$adultNumberInput.val(1); // $adultNumberInput.val(1);
} // }
}) // })
}); // });
//成人 // //成人
$('#plusAdult').click(function () { // $('#plusAdult').click(function () {
adultNumber++; // adultNumber++;
$adultNumberInput.val(adultNumber); // $adultNumberInput.val(adultNumber);
}); // });
$('#minusAdult').click(function () { // $('#minusAdult').click(function () {
if (adultNumber > 1) { // if (adultNumber > 1) {
adultNumber--; // adultNumber--;
$adultNumberInput.val(adultNumber); // $adultNumberInput.val(adultNumber);
} // }
}); // });
// 青少年 // // 青少年
$('#plusTeenager').click(function () { // $('#plusTeenager').click(function () {
teenagerNumber++; // teenagerNumber++;
$teenagerNumberInput.val(teenagerNumber); // $teenagerNumberInput.val(teenagerNumber);
}); // });
$('#minusTeenager').click(function () { // $('#minusTeenager').click(function () {
if (teenagerNumber > 0) { // if (teenagerNumber > 0) {
teenagerNumber--; // teenagerNumber--;
$teenagerNumberInput.val(teenagerNumber); // $teenagerNumberInput.val(teenagerNumber);
} // }
}); // });
// 儿童 // // 儿童
$('#plusChildren').click(function () { // $('#plusChildren').click(function () {
childrenNumber++; // childrenNumber++;
$childrenNumberInput.val(childrenNumber); // $childrenNumberInput.val(childrenNumber);
}); // });
$('#minusChildren').click(function () { // $('#minusChildren').click(function () {
if (childrenNumber > 0) { // if (childrenNumber > 0) {
childrenNumber--; // childrenNumber--;
$childrenNumberInput.val(childrenNumber); // $childrenNumberInput.val(childrenNumber);
} // }
}); // });
// 婴儿 // // 婴儿
$('#plusInfant').click(function () { // $('#plusInfant').click(function () {
infantNumber++; // infantNumber++;
$infantNumberInput.val(infantNumber); // $infantNumberInput.val(infantNumber);
}); // });
$('#minusInfant').click(function () { // $('#minusInfant').click(function () {
if (infantNumber > 0) { // if (infantNumber > 0) {
infantNumber--; // infantNumber--;
$infantNumberInput.val(infantNumber); // $infantNumberInput.val(infantNumber);
} // }
}); // });
</script> </script>

1197
application/views/mobile_first/ah-tour-list-form.php
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save