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

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

Browse Source
hotfix/远程访问多媒体中心
lyt 6 years ago
parent 769c49a185 ae4ebdef60
commit 721cd08ffa
7 changed files with 75 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
application/controllers/information.php
Unescape Escape View File

@ -237,7 +237,7 @@ class Information extends CI_Controller
}
break;
default:
$data['infoTypeList'] = array('不设置' => 'none');
$data['infoTypeList'] = array('不设置' => 'none', '首页' => 'root');
break;
}
}

11
application/third_party/order/controllers/confirm.php vendored
Unescape Escape View File

@ -20,6 +20,7 @@ class Confirm extends CI_Controller {
}
$data['visitor_link'] = $visitor_link;
$data['userinfo'] = $this->Order_model->get_customer_info($COLI_SN);
$data['username'] = '';
if (!empty($data['userinfo'])) {
@ -29,7 +30,7 @@ class Confirm extends CI_Controller {
$data['usermail'] = $v->MEI_MailList;
}
}
} else {
}else {
$this->load->view($site_code.'/link_tips', $data);
return false;
}
@ -37,6 +38,7 @@ class Confirm extends CI_Controller {
$visitor_link_arr = $this->Order_model->get_visitor_link($COLI_SN);
foreach ($visitor_link_arr as $l) {
if ($visitor_link == $l->visitor_link) {
$this->load->view($site_code.'/link_tips', $data);
return false;
}
@ -46,6 +48,7 @@ class Confirm extends CI_Controller {
}
public function save_confirm_info() {
//客人信息
$gender = $this->input->post('gender');
$given_name = $this->input->post('given_name');
@ -53,6 +56,9 @@ class Confirm extends CI_Controller {
$passport = $this->input->post('passport');
$expiration_date = $this->input->post('passport_expiration_date');
$nationality = $this->input->post('nationality');
$occupation=$this->input->post('occupation');
$contact_phone = '座机:' . $this->input->post('landline') . '/手机:' . $this->input->post('mobile');
$COLI_SN = $this->input->post('COLI_SN');
$visitor_link = $this->input->post('visitor_link');
@ -89,6 +95,7 @@ class Confirm extends CI_Controller {
$MEI_FirstName = '';
}
$MEI_LastName = $name;
$CUL_Memo = $this->input->post('insurance_information');
@ -98,7 +105,7 @@ class Confirm extends CI_Controller {
$birthday_tmp = date('Y-m-d H:i:s', strtotime($birthday[$key]));
$expiration_date_tmp = date('Y-m-d H:i:s', strtotime($expiration_date[$key]));
$MEI_SN = $this->Order_model->add_customer_info($gender[$key], $nationality[$key], $MEI_FirstName, $MEI_LastName, $passport[$key], $expiration_date_tmp, $birthday_tmp, $MEI_Memo, $MEI_Street, '', $contact_phone, 0, $COLI_SN, $visitor_link,$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime);
$MEI_SN = $this->Order_model->add_customer_info($occupation[$key],$gender[$key], $nationality[$key], $MEI_FirstName, $MEI_LastName, $passport[$key], $expiration_date_tmp, $birthday_tmp, $MEI_Memo, $MEI_Street, '', $contact_phone, 0, $COLI_SN, $visitor_link,$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime);
}
}

13
application/third_party/order/models/order_model.php vendored
Unescape Escape View File

@ -15,7 +15,7 @@ class Order_model extends CI_Model {
//传统订单客人信息
//$COLI_SN 订单ID
public function get_customer_info($COLI_SN)
{
{
$sql="SELECT COLI_ID,
COLI_SN,
COLI_OPI_ID,
@ -29,7 +29,7 @@ class Order_model extends CI_Model {
OPI_ExtTel,
OPI_Telephone,
OPI_Email,
COLI_CustomerType
COLI_CustomerType
FROM CUstomerList INNER JOIN MEmberInfo ON CUL_CUI_SN=MEI_SN
LEFT JOIN ConfirmLineInfo ON CUL_COLI_SN=COLI_SN
LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN
@ -43,11 +43,12 @@ class Order_model extends CI_Model {
}
//添加客人信息
public function add_customer_info($MEI_Gender,$MEI_Nationality,$MEI_FirstName,$MEI_LastName,$MEI_PassportNo,$MEI_PassportValidDate,$MEI_Birthday,$MEI_Memo,$MEI_Street,$MEI_MailList='',$MEI_Phone='',$CUL_IsEmergency=0,$CUL_COLI_SN='',$visitor_link='',$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime)
public function add_customer_info($MEI_Occupation,$MEI_Gender,$MEI_Nationality,$MEI_FirstName,$MEI_LastName,$MEI_PassportNo,$MEI_PassportValidDate,$MEI_Birthday,$MEI_Memo,$MEI_Street,$MEI_MailList='',$MEI_Phone='',$CUL_IsEmergency=0,$CUL_COLI_SN='',$visitor_link='',$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime)
{
$createdate=date('Y-m-d H:i:s');
$sql="INSERT INTO MEmberInfoTmpCheck
(
MEI_Occupation,
MEI_Gender,
MEI_Nationality,
MEI_FirstName,
@ -57,7 +58,7 @@ class Order_model extends CI_Model {
MEI_Birthday,
MEI_Memo,
MEI_Street,
MEI_MailList,
MEI_MailList,
MEI_Phone,
MEI_ServiceLang,
MEI_IsVendor,
@ -74,8 +75,8 @@ class Order_model extends CI_Model {
MEI_ArrivalTime,
MEI_DepartureFlightNo,
MEI_DepartureTime
) VALUES (?,?,?,?,?,?,?,?,?,?,?,102001,0,0,1,1,?,?,?,?,0,0,?,?,?,?) ";
$this->HT->query($sql, array($MEI_Gender,$MEI_Nationality,$MEI_FirstName,$MEI_LastName,$MEI_PassportNo,$MEI_PassportValidDate,$MEI_Birthday,$MEI_Memo,$MEI_Street,$MEI_MailList,$MEI_Phone,$CUL_IsEmergency,$CUL_COLI_SN,$visitor_link,$createdate,$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime));
) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,102001,0,0,1,1,?,?,?,?,0,0,?,?,?,?) ";
$this->HT->query($sql, array($MEI_Occupation,$MEI_Gender,$MEI_Nationality,$MEI_FirstName,$MEI_LastName,$MEI_PassportNo,$MEI_PassportValidDate,$MEI_Birthday,$MEI_Memo,$MEI_Street,$MEI_MailList,$MEI_Phone,$CUL_IsEmergency,$CUL_COLI_SN,$visitor_link,$createdate,$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime));
$insertid = $this->HT->last_id('MEmberInfoTmpCheck');//$this->HT->insert_id();
return $insertid;
}

79
application/third_party/order/views/confirm_order.php vendored
Unescape Escape View File

@ -20,7 +20,7 @@
<body>
<div id="headerWrapper">
< <div id="headerWrapper">
<div id="header">
<div id="mainnav" class="nav navbar" role="navigation">
<div class="container-fluid">
@ -33,14 +33,14 @@
<div class="col-lg-16 col-sm-13 col-lg-offset-3 col-sm-offset-4">
<div class="navbar-header">
<div class="col-xs-24 btn-lg"></div>
<div class="col-xs-24 text-white">Dear <?php echo $username; ?></div>
<div class="col-xs-24 text-white">Reference Number: <?php echo $userinfo[0]->COLI_ID; ?></div>
<div class="col-xs-24 text-white">Dear Dd</div>
<div class="col-xs-24 text-white">Reference Number: LYY050317061</div>
</div>
</div>
<div class="col-lg-5 col-sm-7 hidden-xs pull-right nopadding">
<div class="tollfree pull-right">
<div class="currentNo col-sm-24 nopadding"><span class="glyphicon glyphicon-earphone" style="font-size:12px;"></span> +86 773 <?php echo $userinfo[0]->OPI_Telephone; ?></div>
<div class="currentNo col-sm-24 nopadding"><span class="glyphicon glyphicon-earphone" style="font-size:12px;"></span> +86 773 </div>
<div class="col-sm-24">
<div class="currentNo col-sm-24 nopadding"> 800-2682918 (USA/CA)</div>
<div class="currentNo col-sm-24 nopadding"> 1800-764678 (AU)</div>
@ -64,10 +64,10 @@
<h4 class="text-center text-red">Please complete and submit the information below.</h4>
<a name="passenger_information" id="passenger_information" ></a>
</div>
<form id="form-confirm-info" method="post" action="https://www.chinahighlights.com/secureinfoconfirm/confirm/save_confirm_info">
<form id="form-confirm-info " method="post" action="https://www.chinahighlights.com/secureinfoconfirm/confirm/save_confirm_info">
<div class="col-xs-24 personinfo-box">
<div class="panel panel-default">
<div class="panel-body">
<div class="panel panel-default form" >
<div class="panel-body form" >
<div class="row panel-new-head">
<h4 class="text-red">Passenger Information <span class="text-muted" style="font-size:15px;">(we need passport info for all the group members)</span><br/>
@ -77,30 +77,33 @@
</div>
<div class="col-xs-24 nopadding hidden-xs">
<div class="form-group col-sm-8 nopadding-R" style="margin-bottom:0px;">
<div class="form-group col-sm-7 nopadding-R" style="margin-bottom:0px;">
<label style="width:100%;text-align:left !important;">
<div class="col-xs-24 nopadding" style="height:15px;font-weight:normal;">
Sur name/First and Middle name<a href="javascript:void(0);" data-toggle="modal" data-target="#sampleModal"> (Sample ▼)</a>
</div>
</label>
</div>
<div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
<div class="form-group col-sm-3 nopadding-R" style="margin-bottom:0px;">
<label class="" style="font-weight:normal">Passport No.</label>
</div>
<div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
<label class="" style="font-weight:normal">Passport Expiration Date</label>
</div>
<div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
<div class="form-group col-sm-3 nopadding-R" style="margin-bottom:0px;">
<label class="" style="font-weight:normal">Birthday</label>
</div>
<div class="form-group col-sm-4" style="margin-bottom:0px;">
<div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
<label class="" style="font-weight:normal">Nationality</label>
</div>
<div class="form-group col-sm-3 nopadding-l" style="margin-bottom:0px;">
<label class="" style="font-weight:normal">Occupation</label>
</div>
</div>
<div class="col-xs-24 nopadding personinfo-input-box">
<div class="form-group col-sm-8 nopadding-R">
<div class="form-group col-sm-7 nopadding-R">
<label class="visible-xs-block" style="width:100%;text-align:left !important;">
<div class="col-xs-24 nopadding" style="height:15px;">
Sur name/First and Middle name<a href="javascript:void(0);" data-toggle="modal" data-target="#sampleModal"> (Sample ▼)</a>
@ -130,7 +133,7 @@
</div>
</div>
<div class="form-group col-sm-4 nopadding-R">
<div class="form-group col-sm-3 nopadding-R">
<label class="visible-xs-block">Passport No.</label>
<input type="text" class="form-control input-sm common_input" name="passport[]" value="" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your passport!" autocomplete="off">
</div>
@ -142,7 +145,7 @@
</div>
</div>
<div class="form-group col-sm-4 nopadding-R">
<div class="form-group col-sm-3 nopadding-R">
<label class="visible-xs-block">Birthday</label>
<div class="input-groups date " data-date="1970-05-20">
<input class="form-control input-sm common_input bd_datepicker" type="text" name="birthday[]" value="" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your birthday!" autocomplete="off" style="color:#333333 !important;">
@ -151,7 +154,6 @@
<div class="form-group col-sm-4">
<label class="visible-xs-block">Nationality</label>
<div class="input-group">
<select class="form-control input-sm common_input" name="nationality[]">
<option value="18" selected="selected">Australia</option>
<option value="5">Canada</option>
@ -391,12 +393,40 @@
<option value="665">Zambia</option>
<option value="666">Zimbabwe</option>
</select>
<span class="input-group-addon" style="background:#fff;border:none;padding:2px 3px;">
</div>
<div class="form-group col-sm-3 nopadding-L">
<div class="input-group">
<label class="visible-xs-block">Occupation</label>
<select class="form-control input-sm nopadding select_occupation" name="occupation[]" placeholder="Occupation" >
<option value="null"></option>
<option value="Retired">Retired</option>
<option value="Agriculture, Food & Natural Resources">Agriculture, Food & Natural Resources</option>
<option value="Architecture & Construction">Architecture & Construction</option>
<option value="Arts, Audio/Video Technology & Communications">Arts, Audio/Video Technology & Communications</option>
<option value="Business Management & Administration">Business Management & Administration</option>
<option value="Education & Training">Education & Training</option>
<option value="Finance">Finance</option>
<option value="Government & Public Administration">Government & Public Administration</option>
<option value="Health Science">Health Science</option>
<option value="Hospitality & Tourism">Hospitality & Tourism</option>
<option value="Human Services">Human Services</option>
<option value="Information Technology">Information Technology</option>
<option value="Law, Public Safety, Corrections & Security">Law, Public Safety, Corrections & Security</option>
<option value="Manufacturing">Manufacturing</option>
<option value="Marketing, Sales & Service">Marketing, Sales & Service</option>
<option value="Science, Technology, Engineering & Mathematics">Science, Technology, Engineering & Mathematics</option>
<option value="Transportation, Distribution & Logistics">Transportation, Distribution & Logistics</option>
<option value="Housewife">Housewife</option>
<option value="Other">Other</option>
</select>
<span class="input-group-addon" style="background:#fff;border:none;padding:2px 3px;">
<span class="glyphicon glyphicon-minuss text-danger"></span>
</span>
</span>
</div>
</div>
</div>
</div>
<div class="col-xs-24 add-personinfo-box">
@ -451,9 +481,9 @@
</div>
</div>
</div>
</div>
<div class="col-xs-24 flightinfo-box">
<div class="col-xs-24 flightinfo-box" >
<div class="panel panel-default">
<div class="panel-body">
@ -492,7 +522,7 @@
</div>
</div>
<div class="col-xs-24">
<div class="col-xs-24 SpecialRequest">
<div class="panel panel-default">
<div class="panel-body">
@ -520,7 +550,7 @@
</div>
</div>
<?php if ($userinfo[0]->COLI_CustomerType != 44003) { ?>
<div class="col-xs-24">
<div class="col-xs-24 EmergencyContactInformation" >
<div class="panel panel-default">
<div class="panel-body">
@ -569,7 +599,7 @@
</div>
<?php } ?>
<div class="col-xs-24">
<div class="col-xs-24 Insurance Information" >
<div class="panel panel-default">
<div class="panel-body">
@ -611,7 +641,6 @@
</div>
</form>
</div>
</div>

2
application/third_party/trainsystem/controllers/callback.php vendored
Unescape Escape View File

@ -254,7 +254,7 @@ class callback extends CI_Controller{
$this->train_system_model->add_passagers($data_passager);
}
}else{
foreach($ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket as $items){
foreach($ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->DetailInfos->DetailInfo as $items){
//对订票乘客进行存储
$data_passager->status = '4';
$data_passager->ordernumber = $ctrip_backdata->TrainOrderService->OrderInfo->OrderNumber;

4
application/third_party/trainsystem/helpers/train_helper.php vendored
Unescape Escape View File

@ -35,8 +35,8 @@ function strexchangeid($name){
//特殊字符转换
function chk_sp_name($name){
$name = str_replace(
array('á','ë','é','è','í','ó','ú','á','é','í','ó','ú',' ','/',' ',','),
array('a','e','e','e','i','o','u','A','E','I','O','U','','','',''),
array('á','ë','é','è','í','ó','ú','ű','ñ','á','é','í','ó','ú','ű','ñ','/',' '),
array('a','e','e','e','i','o','u','u','n','A','E','I','O','U','U','N','',''),
$name
);
return substr(strtoupper($name),0,30);

2
application/third_party/trainsystem/models/train_system_model.php vendored
Unescape Escape View File

@ -145,7 +145,7 @@ class train_system_model extends CI_Model {
}
function add_passagers($data){
$sql = "IF EXISTS (select * from trainsystem_tickets where tst_ordernumber = '{$data->ordernumber}' and tst_numberid = '{$data->numberid}')
$sql = "IF EXISTS (select * from trainsystem_tickets where tst_ordernumber = '{$data->ordernumber}' and tst_numberid = '{$data->numberid}' and tst_realname = '{$data->realname}')
update
trainsystem_tickets
set

Write Preview
Loading…
Cancel
Save