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

hotfix/paypal-note
赵鹏 3 years ago
commit 2d27e8d09f

@ -983,6 +983,14 @@ class Information extends CI_Controller
file_put_contents($html_path, $template, LOCK_EX);
}
public function test_recommand()
{
$information = $this->Information_model->Detail($this->input->get('is_id'));
$recommand_information = $this->recommand_information($information);
var_dump($recommand_information);
}
public function test_feedback()
{
$feedback_newest = $this->Feedback_model->test_feedback_newest();

@ -89,10 +89,10 @@ class Confirm extends CI_Controller {
$COLI_ID = $this->input->post('COLI_ID');
//航班信息
$MEI_ArrivalFlightNo = $this->input->post('MEI_ArrivalFlightNo');
// HTML datetime-local 获取的值2023-05-29T15:45需要替换 T 为空格才能符合数据类型
$MEI_ArrivalTime = str_replace("T", " ", $this->input->post('MEI_ArrivalTime'));
$MEI_DepartureFlightNo = $this->input->post('MEI_DepartureFlightNo');
$MEI_DepartureTime = str_replace("T", " ", $this->input->post('MEI_DepartureTime'));
// HTML datetime-local 获取的值2023-05-29T15:45需要替换 T 为空格才能符合数据类型
$MEI_ArrivalTime = str_replace("T", " ", $this->input->post('MEI_ArrivalDate').' '.$this->input->post('MEI_ArrivalTime'));
$MEI_DepartureTime = str_replace("T", " ", $this->input->post('MEI_DepartureDate').' '.$this->input->post('MEI_DepartureTime'));
//已经确认过
@ -159,13 +159,14 @@ class Confirm extends CI_Controller {
}
}
//只有ch有review功能
function review() {
header('Content-type: application/json;charset=utf-8');
$data = array();
$data['postdata'] = $this->input->post();
$mail_text = $this->load->view('mailtext', $data, true);
echo json_encode($mail_text);
header('Content-type: application/json;charset=utf-8');
$data = array();
$site_code = $this->input->get('site_code');
$viewName = $site_code.'/mailtext';
$data['postdata'] = $this->input->post();
$mail_text = $this->load->view($viewName, $data, true);
echo json_encode($mail_text);
}
}

@ -767,9 +767,10 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div class="selectionBlock">
<div class="inputTerm">
<input type="datetime-local" name="MEI_ArrivalTime" required="">
<input type="date" name="MEI_ArrivalDate" required="">
<input type="time" name="MEI_ArrivalTime">
<label>
Arrival time
Arrival date
</label>
</div>
</div>
@ -783,9 +784,10 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div class="selectionBlock">
<div class="inputTerm">
<input type="datetime-local" name="MEI_DepartureTime" required="">
<input type="date" name="MEI_DepartureDate" required="">
<input type="time" name="MEI_DepartureTime">
<label>
Departure time
Departure date
</label>
</div>
</div>
@ -928,7 +930,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
type: "post",
dataType: "json",
data: $("#form-confirm-info").serialize(),
url: 'https://www.chinahighlights.com/secureinfoconfirm/confirm/review',
url: 'https://www.chinahighlights.com/secureinfoconfirm/confirm/review?site_code=ah',
success: function(data, textStatus) {
$('#reviewModal_body').html(data);
$('#reviewModal').modal('show');
@ -947,42 +949,6 @@ select.gender_pick {border: 1px solid #d1d1d1;
var travelerCount = $(".traveler_info").length + 1;
$addTraveler.find('[data-header]').text('Traveler ' + travelerCount);
$('#add_traveler_button').before($addTraveler);
$('.datepicker').datepicker({
controlType: 'select',
oneLine: true,
changeMonth: true,
changeYear: true,
yearRange: '2010:2055',
timeFormat: 'mm/dd/yy'
});
$('.datetimepicker').datetimepicker({
controlType: 'select',
oneLine: true,
changeMonth: false,
changeYear: false,
timeFormat: 'H:mm'
});
});
$('.datepicker').datepicker({
controlType: 'select',
oneLine: true,
changeMonth: true,
changeYear: true,
yearRange: '2010:2055',
timeFormat: 'mm/dd/yy'
});
$('.datetimepicker').datetimepicker({
controlType: 'select',
oneLine: true,
changeMonth: false,
changeYear: false,
timeFormat: 'H:mm'
});
});
</script>

@ -0,0 +1,76 @@
<p >
China Highlights is not responsible for any costs or consequences which may arise from failure on your part to provide correct information (For example, wrongly spelt names may cause your flight tickets to be cancelled, incorrect incoming flight number may lead to failure in pick-up etc.).<br />
</p>
<h4 class="text-red" style="box-sizing:border-box;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-weight:500;line-height:1.1;color:#AA2E2D;margin-top:10px;margin-bottom:15px;font-size:24px;padding:12px 0 12px 0;border-bottom:1px solid #dddddd;border-top:1px solid #dddddd;white-space:normal;background-color:#FFFFFF;">
Passenger Information
</h4>
<?php foreach ($postdata['sur_name'] as $key => $sur) { ?>
<?php
if (!isset($postdata['given_name'][$key]) || $postdata['given_name'][$key] == 'None')
$postdata['given_name'][$key] = '';
if (!isset($postdata['passport'][$key]) || $postdata['passport'][$key] == 'None')
$postdata['passport'][$key] = '';
if (!isset($postdata['passport_expiration_date'][$key]) || $postdata['passport_expiration_date'][$key] == 'None')
$postdata['passport_expiration_date'][$key] = '';
if (!isset($postdata['birthday'][$key]) || $postdata['birthday'][$key] == 'None')
$postdata['birthday'][$key] = '';
?>
<h3>Passenger <?php echo $key + 1; ?></h3>
<p style="margin:0;">Sur name/First and Middle name:<?php echo $sur . '/' . $postdata['given_name'][$key]; ?></p>
<p style="margin:0;">Passport No.:<?php echo $postdata['passport'][$key]; ?></p>
<p style="margin:0;">Passport Expiration Date:<?php echo $postdata['passport_expiration_date'][$key]; ?></p>
<p style="margin:0;">Birthday:<?php echo $postdata['birthday'][$key]; ?></p>
<?php } ?>
<h3>Contact Information</h3>
<p style="margin:0;">Land line:<?php if (isset($postdata['landline'])) echo $postdata['landline']; ?></p>
<p style="margin:0;">Mobile:<?php if (isset($postdata['mobile'])) echo $postdata['mobile']; ?></p>
<h4 class="text-red" style="box-sizing:border-box;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-weight:500;line-height:1.1;color:#AA2E2D;margin-top:10px;margin-bottom:15px;font-size:24px;padding:12px 0 12px 0;border-bottom:1px solid #dddddd;border-top:1px solid #dddddd;white-space:normal;background-color:#FFFFFF;">
Flight Information
</h4>
<p style="margin:0;">Arrival Flight No.:<?php if (isset($postdata['MEI_ArrivalFlightNo'])) echo $postdata['MEI_ArrivalFlightNo']; ?></p>
<p style="margin:0;">
Arrival date:<?php if (isset($postdata['MEI_ArrivalDate'])) echo $postdata['MEI_ArrivalDate']; ?>
</p>
<p style="margin:0;">
Arrival time:<?php if (isset($postdata['MEI_ArrivalTime'])) echo $postdata['MEI_ArrivalTime']; ?>
</p>
<p style="margin:0;">
Departure Flight no.:<?php if (isset($postdata['MEI_DepartureFlightNo'])) echo $postdata['MEI_DepartureFlightNo']; ?>
</p>
<p style="margin:0;">
Departure date:<?php if (isset($postdata['MEI_DepartureDate'])) echo $postdata['MEI_DepartureDate']; ?>
</p>
<p style="margin:0;">
Departure time:<?php if (isset($postdata['MEI_DepartureTime'])) echo $postdata['MEI_DepartureTime']; ?>
</p>
<h4 class="text-red" style="box-sizing:border-box;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-weight:500;line-height:1.1;color:#AA2E2D;margin-top:10px;margin-bottom:15px;font-size:24px;padding:12px 0 12px 0;border-bottom:1px solid #dddddd;border-top:1px solid #dddddd;white-space:normal;background-color:#FFFFFF;">
Special Request
</h4>
<p style="margin:0;">
<?php if (isset($postdata['special_request'])) echo $postdata['special_request']; ?>
<br />
</p>
<h4 class="text-red" style="box-sizing:border-box;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-weight:500;line-height:1.1;color:#AA2E2D;margin-top:10px;margin-bottom:15px;font-size:24px;padding:12px 0 12px 0;border-bottom:1px solid #dddddd;border-top:1px solid #dddddd;white-space:normal;background-color:#FFFFFF;">
Insurance Information
</h4>
<p style="margin:0;">
<?php if (isset($postdata['insurance_information'])) echo $postdata['insurance_information']; ?>
<br />
</p>
<h4 class="text-red" style="box-sizing:border-box;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-weight:500;line-height:1.1;color:#AA2E2D;margin-top:10px;margin-bottom:15px;font-size:24px;padding:12px 0 12px 0;border-bottom:1px solid #dddddd;border-top:1px solid #dddddd;white-space:normal;background-color:#FFFFFF;">
Emergency Contact Information
</h4>
<p style="margin:0;">
Contact person name:<?php if (isset($postdata['emergency_person_name'])) echo $postdata['emergency_person_name']; ?>
</p>
<p style="margin:0;">
Relationship with him/her:<?php if (isset($postdata['emergency_relationship'])) echo $postdata['emergency_relationship']; ?>
</p>
<p style="margin:0;">
E-mail address:<?php if (isset($postdata['emergency_email'])) echo $postdata['emergency_email']; ?>
</p>
<p style="margin:0;">
Telephone no.:<?php if (isset($postdata['emergency_telephone'])) echo $postdata['emergency_telephone']; ?>
</p>

@ -109,6 +109,58 @@
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Article I <a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Article I')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Article I']) ? '继承上级' : $recommends['Content Article I']->ir_rule . '<br/>' . $recommends['Content Article I']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Article J <a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Article J')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Article J']) ? '继承上级' : $recommends['Content Article J']->ir_rule . '<br/>' . $recommends['Content Article J']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Article K <a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Article K')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Article K']) ? '继承上级' : $recommends['Content Article K']->ir_rule . '<br/>' . $recommends['Content Article K']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Article L <a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Article L')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Article L']) ? '继承上级' : $recommends['Content Article L']->ir_rule . '<br/>' . $recommends['Content Article L']->ir_keyword; ?>
</div>
</div>
</div>
</div>
<!-- 文中信息推荐 end -->
@ -164,10 +216,7 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Tour E<a
@ -216,6 +265,56 @@
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Tour I<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Tour I')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Tour I']) ? '继承上级' : $recommends['Content Tour I']->ir_rule . '<br/>' . $recommends['Content Tour I']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Tour J<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Tour J')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Tour J']) ? '继承上级' : $recommends['Content Tour J']->ir_rule . '<br/>' . $recommends['Content Tour J']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Tour K<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Tour K')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Tour K']) ? '继承上级' : $recommends['Content Tour K']->ir_rule . '<br/>' . $recommends['Content Tour K']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Tour L<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Tour L')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Tour L']) ? '继承上级' : $recommends['Content Tour L']->ir_rule . '<br/>' . $recommends['Content Tour L']->ir_keyword; ?>
</div>
</div>
</div>
</div>
<!-- 文中线路推荐 end -->
@ -248,6 +347,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">右侧列表广告</div>
<div class="panel-body">
<ol>
<?php for ($i=1; $i<=36; $i++) { ?>
<li>
<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'List Tips Right <?php echo $i ?>')"
>
List Tips Right <?php echo $i ?> <?php echo empty($recommends['List Tips Right '.$i]) ? '继承上级' : $recommends['List Tips Right '.$i]->ir_rule; ?>
</a>
</li>
<?php } ?>
</ol>
</div>
</div>
</div>
</div>
@ -302,10 +421,9 @@
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Article E <a
@ -354,6 +472,61 @@
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Article I<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Article I')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Article I']) ? '继承上级' : $recommends['Article I']->ir_rule . '<br/>' . $recommends['Article I']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Article J<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Article J')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Article J']) ? '继承上级' : $recommends['Article J']->ir_rule . '<br/>' . $recommends['Article J']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Article K<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Article K')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Article K']) ? '继承上级' : $recommends['Article K']->ir_rule . '<br/>' . $recommends['Article K']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Article L<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Article L')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Article L']) ? '继承上级' : $recommends['Article L']->ir_rule . '<br/>' . $recommends['Article L']->ir_keyword; ?>
</div>
</div>
</div>
</div>
<!-- 信息推荐 end -->
@ -408,10 +581,7 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Tour E<a
@ -460,6 +630,54 @@
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Tour I<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Tour I')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Tour I']) ? '继承上级' : $recommends['Tour I']->ir_rule . '<br/>' . $recommends['Tour I']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Tour J<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Tour J')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Tour J']) ? '继承上级' : $recommends['Tour J']->ir_rule . '<br/>' . $recommends['Tour J']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Tour K<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Tour K')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Tour K']) ? '继承上级' : $recommends['Tour K']->ir_rule . '<br/>' . $recommends['Tour K']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Tour L<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Tour L')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Tour L']) ? '继承上级' : $recommends['Tour L']->ir_rule . '<br/>' . $recommends['Tour L']->ir_keyword; ?>
</div>
</div>
</div>
</div>
<!-- 线路推荐 end -->

@ -1,4 +1,4 @@
<h3>CH文中信息广告代码</h3>
<!--<h3>CH文中信息广告代码</h3>
<div class="righttour"><a href="/beijing/"><img alt="Beijing trip" class="img-responsive" height="500" src="https://images.chinahighlights.com/allpicture/2015/10/0737277da892436db2906dd5_cut_800x500_10.jpg" style="width: 100%;" width="800" /></a>
@ -6,6 +6,7 @@
<div class="rightname" style="font-size: 25px;"><a href="/beijing/">Beijing Travel Guide</a></div>
<span class="rightdestination">All things you need to know</span> <span class="tourbutton"> <a href="/beijing/">view more </a></span></div>
</div>
-->
<h3>CH文中tour广告代码</h3>

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