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

master
candice 2 years ago
commit 7933f856bc

File diff suppressed because it is too large Load Diff

@ -7,8 +7,8 @@
<title>
Passport Information for All the Group Members
</title>
<meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
<link href="https://data.chinahighlights.com/css/min.php?f=/css/customer_center_data/bootstrap.min.css,/css/customer_center_data/bootstrap-datetimepicker.min.css&v=202302061045" rel="stylesheet">
<meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
<link href="https://data.chinahighlights.com/css/min.php?f=/css/customer_center_data/bootstrap.min.css&v=202405161016" rel="stylesheet">
<style>
body {
margin: 0;
@ -681,14 +681,14 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div class="selectionBlock">
<p> Date of birth</p>
<input type="date" class="arrivalDate datepicker"
name="birthday[]" value="" placeholder="mm/dd/yyyy" autocomplete="off">
</div>
<div class="selectionBlock">
<p> Date of expiration </p>
<input type="date" class="arrivalDate datepicker"
name="passport_expiration_date[]" value="" placeholder="mm/dd/yyyy" autocomplete="off">
@ -710,7 +710,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
<button class="add_traveler_button" id="add_traveler_button" type="button">+ Add a traveler</button>
</div>
</div>
<div id="inquiryBox">
<h2>Your Flight Information</h2>
@ -723,7 +723,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
<div class="selectionBlock" style="width: 100%;">
<div class="inputTerm">
<input type="text" name="MEI_ArrivalFlightNo" required="">
<input type="text" name="MEI_ArrivalFlightNo">
<label>
Arrival flight No.
</label>
@ -732,18 +732,18 @@ select.gender_pick {border: 1px solid #d1d1d1;
<div class="selectionBlock">
<p>Arrival date</p>
<div class="inputTerm">
<input type="date" name="MEI_ArrivalDate" required="">
<input type="date" name="MEI_ArrivalDate">
</div>
</div>
<div class="selectionBlock">
<div class="inputTerm">
<input type="time" name="MEI_ArrivalTime" required="">
<input type="time" name="MEI_ArrivalTime">
</div>
</div>
<div class="selectionBlock" style="width: 100%;">
<div class="inputTerm">
<input type="text" name="MEI_DepartureFlightNo" required="">
<input type="text" name="MEI_DepartureFlightNo">
<label>
Departure Flight No.
</label>
@ -752,18 +752,18 @@ select.gender_pick {border: 1px solid #d1d1d1;
<div class="selectionBlock">
<p>Departure date</p>
<div class="inputTerm">
<input type="date" name="MEI_DepartureDate" required="">
<input type="date" name="MEI_DepartureDate">
</div>
</div>
<div class="selectionBlock">
<div class="inputTerm">
<input type="time" name="MEI_DepartureTime" required="">
<input type="time" name="MEI_DepartureTime">
</div>
</div>
</div>
<div id="inquiryBox">
<h2>Emergency Contact Information</h2>
@ -805,16 +805,16 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div id="inquiryBox">
<h2>Your Insurance Information and Special Request (optional)</h2>
<textarea id="special_request" name="special_request" style="resize:none;"></textarea>
</div>
<div class="inquiryBtn">
<div class="inquiryBtn">
<input type="hidden" name="toname" value="<?php echo $userinfo[0]->OPI_FirstName; ?>">
<input type="hidden" name="tomail" value="<?php echo $userinfo[0]->OPI_Email; ?>">
<input type="hidden" name="customer_username" value="<?php echo $username; ?>">
<input type="hidden" name="customer_usermail" value="<?php echo $usermail; ?>">
<input type="hidden" name="tomail" value="<?php echo $userinfo[0]->OPI_Email; ?>">
<input type="hidden" name="customer_username" value="<?php echo $username; ?>">
<input type="hidden" name="customer_usermail" value="<?php echo $usermail; ?>">
<input type="hidden" name="COLI_ID" value="<?php echo $userinfo[0]->COLI_ID; ?>">
<input type="hidden" name="COLI_SN" value="<?php echo $userinfo[0]->COLI_SN; ?>">
<input type="hidden" name="visitor_link" value="<?php echo $visitor_link; ?>">
@ -843,8 +843,8 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
</div>
</div>
<!-- reviewModal end-->
<script src="https://data.chinahighlights.com/js/min.php?f=/js/customer_center_data/jquery.min.js,/js/customer_center_data/bootstrap.min.js,/js/customer_center_data/jquery-ui.min.js,/js/customer_center_data/jquery-ui-timepicker-addon.js&v=2019092401"></script>
<!-- reviewModal end-->
<script src="https://data.chinahighlights.com/js/min.php?f=/js/customer_center_data/jquery.min.js,/js/customer_center_data/bootstrap.min.js,/js/customer_center_data/jquery-ui.min.js&v=202405161016"></script>
<script>
function submit_info_form () {
var $btn = $("#btn-add-userinfo").button('loading');
@ -907,7 +907,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
}
});
}
$(function() {
var $travelerTemplate = $(".traveler_info:first").clone();
//添加客户

@ -6,8 +6,8 @@
<title>
Passport Information for All the Group Members
</title>
<meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
<link href="https://data.chinahighlights.com/css/min.php?f=/css/customer_center_data/bootstrap.min.css,/css/customer_center_data/bootstrap-datetimepicker.min.css&v=202302061045" rel="stylesheet">
<meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
<link href="https://data.chinahighlights.com/css/min.php?f=/css/customer_center_data/bootstrap.min.css&v=202405161016" rel="stylesheet">
<style>
body {
margin: 0;
@ -402,7 +402,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
<div class="traveler_info">
<h3 data-header>Primary contact</h3>
<div class="selectionBlock">
<select name="gender[]" class="gender_pick">
<option value="100001">Mr.</option>
@ -683,14 +683,14 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div class="selectionBlock">
<p> Date of birth</p>
<input type="date" class="arrivalDate datepicker"
name="birthday[]" value="" placeholder="mm/dd/yyyy" autocomplete="off">
</div>
<div class="selectionBlock">
<p> Date of expiration </p>
<input type="date" class="arrivalDate datepicker"
name="passport_expiration_date[]" value="" placeholder="mm/dd/yyyy" autocomplete="off">
@ -718,13 +718,13 @@ select.gender_pick {border: 1px solid #d1d1d1;
<h2>Your Flight Information</h2>
<p>Your flight information will be forwarded to your guide/driver for airport pick up and drop off.
Please ensure the details you provide are correct. You can skip this if your don't need airport
transfer service.</p>
transfer service.</p>
<p>If you are not yet purchase your airline and insurance, please fill in the TBC in the link and provide those information to your consultant or keep update after you confirm them.</p>
<div class="selectionBlock" style="width: 100%;">
<div class="inputTerm">
<input type="text" name="MEI_ArrivalFlightNo" required="">
<input type="text" name="MEI_ArrivalFlightNo">
<label>
Arrival flight No.
</label>
@ -733,13 +733,13 @@ select.gender_pick {border: 1px solid #d1d1d1;
<div class="selectionBlock" style="width: 100%;">
<p>Arrival time</p>
<div class="inputTerm">
<input type="datetime-local" name="MEI_ArrivalTime" required="">
<input type="datetime-local" name="MEI_ArrivalTime">
</div>
</div>
<div class="selectionBlock" style="width: 100%;">
<div class="inputTerm">
<input type="text" name="MEI_DepartureFlightNo" required="">
<input type="text" name="MEI_DepartureFlightNo">
<label>
Departure Flight No.
</label>
@ -748,14 +748,10 @@ select.gender_pick {border: 1px solid #d1d1d1;
<div class="selectionBlock" style="width: 100%;">
<p>Departure time</p>
<div class="inputTerm">
<input type="datetime-local" name="MEI_DepartureTime" required="">
<input type="datetime-local" name="MEI_DepartureTime">
</div>
</div>
</div>
<div id="inquiryBox">
<h2>Emergency Contact Information</h2>
<div class="emergency_title">(in case an unlikely event happens when you are travelling)</div>
@ -796,14 +792,14 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div id="inquiryBox">
<h2>Your Insurance Information and Other Special Request (optional)</h2>
<textarea id="special_request" name="special_request" style="resize:none;"></textarea>
</div>
<div class="inquiryBtn">
<div class="inquiryBtn">
<input type="hidden" name="toname" value="<?php echo $userinfo[0]->OPI_FirstName; ?>">
<input type="hidden" name="tomail" value="<?php echo $userinfo[0]->OPI_Email; ?>">
<input type="hidden" name="customer_username" value="<?php echo $username; ?>">
<input type="hidden" name="customer_usermail" value="<?php echo $usermail; ?>">
<input type="hidden" name="tomail" value="<?php echo $userinfo[0]->OPI_Email; ?>">
<input type="hidden" name="customer_username" value="<?php echo $username; ?>">
<input type="hidden" name="customer_usermail" value="<?php echo $usermail; ?>">
<input type="hidden" name="COLI_ID" value="<?php echo $userinfo[0]->COLI_ID; ?>">
<input type="hidden" name="COLI_SN" value="<?php echo $userinfo[0]->COLI_SN; ?>">
<input type="hidden" name="visitor_link" value="<?php echo $visitor_link; ?>">
@ -832,8 +828,8 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
</div>
</div>
<!-- reviewModal end-->
<script src="https://data.chinahighlights.com/js/min.php?f=/js/customer_center_data/jquery.min.js,/js/customer_center_data/bootstrap.min.js,/js/customer_center_data/jquery-ui.min.js,/js/customer_center_data/jquery-ui-timepicker-addon.js&v=2019092401"></script>
<!-- reviewModal end-->
<script src="https://data.chinahighlights.com/js/min.php?f=/js/customer_center_data/jquery.min.js,/js/customer_center_data/bootstrap.min.js,/js/customer_center_data/jquery-ui.min.js&v=202405161016"></script>
<script>
function submit_info_form () {
var $btn = $("#btn-add-userinfo").button('loading');
@ -896,7 +892,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
}
});
}
$(function() {
var $travelerTemplate = $(".traveler_info:first").clone();
//添加客户

@ -7,8 +7,8 @@
<title>
Passport Information for All the Group Members
</title>
<meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
<link href="https://data.chinahighlights.com/css/min.php?f=/css/customer_center_data/bootstrap.min.css,/css/customer_center_data/bootstrap-datetimepicker.min.css&v=202302061045" rel="stylesheet">
<meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
<link href="https://data.chinahighlights.com/css/min.php?f=/css/customer_center_data/bootstrap.min.css&v=202405161016" rel="stylesheet">
<style>
body {
margin: 0;
@ -684,14 +684,14 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div class="selectionBlock">
<p> Date of birth</p>
<input type="date" class="arrivalDate datepicker"
name="birthday[]" value="" placeholder="mm/dd/yyyy" autocomplete="off">
</div>
<div class="selectionBlock">
<p> Date of expiration </p>
<input type="date" class="arrivalDate datepicker"
name="passport_expiration_date[]" value="" placeholder="mm/dd/yyyy" autocomplete="off">
@ -725,7 +725,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
<div class="selectionBlock">
<div class="inputTerm">
<input type="text" name="MEI_ArrivalFlightNo" required="">
<input type="text" name="MEI_ArrivalFlightNo">
<label>
Arrival flight No.
</label>
@ -733,7 +733,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div class="selectionBlock">
<div class="inputTerm">
<input type="datetime-local" name="MEI_ArrivalTime" required="">
<input type="datetime-local" name="MEI_ArrivalTime">
<label>
Arrival time
</label>
@ -741,7 +741,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div class="selectionBlock">
<div class="inputTerm">
<input type="text" name="MEI_DepartureFlightNo" required="">
<input type="text" name="MEI_DepartureFlightNo">
<label>
Departure Flight No.
</label>
@ -749,7 +749,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div class="selectionBlock">
<div class="inputTerm">
<input type="datetime-local" name="MEI_DepartureTime" required="">
<input type="datetime-local" name="MEI_DepartureTime">
<label>
Departure time
</label>
@ -757,7 +757,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
</div>
<div id="inquiryBox">
<h2>Emergency Contact Information</h2>
@ -799,15 +799,15 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
<div id="inquiryBox">
<h2>Your Insurance Information and Special Request (optional)</h2>
<textarea id="special_request" name="special_request" style="resize:none;"></textarea>
</div>
<div class="inquiryBtn">
<div class="inquiryBtn">
<input type="hidden" name="toname" value="<?php echo $userinfo[0]->OPI_FirstName; ?>">
<input type="hidden" name="tomail" value="<?php echo $userinfo[0]->OPI_Email; ?>">
<input type="hidden" name="customer_username" value="<?php echo $username; ?>">
<input type="hidden" name="customer_usermail" value="<?php echo $usermail; ?>">
<input type="hidden" name="tomail" value="<?php echo $userinfo[0]->OPI_Email; ?>">
<input type="hidden" name="customer_username" value="<?php echo $username; ?>">
<input type="hidden" name="customer_usermail" value="<?php echo $usermail; ?>">
<input type="hidden" name="COLI_ID" value="<?php echo $userinfo[0]->COLI_ID; ?>">
<input type="hidden" name="COLI_SN" value="<?php echo $userinfo[0]->COLI_SN; ?>">
<input type="hidden" name="visitor_link" value="<?php echo $visitor_link; ?>">
@ -836,8 +836,8 @@ select.gender_pick {border: 1px solid #d1d1d1;
</div>
</div>
</div>
<!-- reviewModal end-->
<script src="https://data.chinahighlights.com/js/min.php?f=/js/customer_center_data/jquery.min.js,/js/customer_center_data/bootstrap.min.js,/js/customer_center_data/jquery-ui.min.js,/js/customer_center_data/jquery-ui-timepicker-addon.js&v=2019092401"></script>
<!-- reviewModal end-->
<script src="https://data.chinahighlights.com/js/min.php?f=/js/customer_center_data/jquery.min.js,/js/customer_center_data/bootstrap.min.js,/js/customer_center_data/jquery-ui.min.js&v=202405161016"></script>
<script>
function submit_info_form () {
var $btn = $("#btn-add-userinfo").button('loading');
@ -900,7 +900,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
}
});
}
$(function() {
var $travelerTemplate = $(".traveler_info:first").clone();
//添加客户

@ -330,7 +330,7 @@ class BIZ_train_model extends CI_Model {
//获取能够自动出票的订单列表2.0版本 20240130 zp (coli_state 11 我的订单 8 已收款 63 出票中 13 新订单(已支付))
function auto_check_ticket_2(){
$sql = "SELECT distinct top 10 COLD_SN ,coli_id,COLD_SPFS,COLI_State,(SELECT TOP 1 GAI_Type FROM BIZ_GroupAccountInfo WHERE GAI_COLI_SN=bcli.COLI_SN AND ISNULL(DeleteFlag,0)=0) as GAI_Type
$sql = "SELECT top 10 COLD_SN ,coli_id,COLD_SPFS,COLI_State,(SELECT TOP 1 GAI_Type FROM BIZ_GroupAccountInfo WHERE GAI_COLI_SN=bcli.COLI_SN AND ISNULL(DeleteFlag,0)=0) as GAI_Type
,cold_startdate
,isnull((select top 1 ts_autotimes from InfoManager.dbo.trainsystem where ts_cold_sn= bcld.cold_sn order by ts_id desc),0) as ts_autotimes
,(select top 1 ts_autolasttime from InfoManager.dbo.trainsystem where ts_cold_sn= bcld.cold_sn order by ts_id desc) as ts_autolasttime
@ -339,7 +339,7 @@ class BIZ_train_model extends CI_Model {
INNER JOIN dbo.OperatorInfo ON OPI_SN=COLI_OPI_ID and OPI_DEI_SN=10 AND ISNULL(dbo.OperatorInfo.DeleteFlag,0)=0
WHERE bcli.COLI_ServiceType = '2'
AND bcli.COLI_State in ('13','63')
AND EXISTS(SELECT GAI_SN FROM BIZ_GroupAccountInfo WHERE GAI_COLI_SN=bcli.COLI_SN AND (bcli.COLI_Price - GAI_SQJE) <= 20 AND (GAI_SQJE - bcli.COLI_Price) >= -20 AND isnull(DeleteFlag,0) = 0)
AND EXISTS(SELECT sum(GAI_SQJE) FROM BIZ_GroupAccountInfo WHERE GAI_COLI_SN=bcli.COLI_SN AND isnull(DeleteFlag,0) = 0 having (bcli.COLI_Price - Sum(GAI_SQJE)) <= 20 AND (Sum(GAI_SQJE) - bcli.COLI_Price) >= -20 )
AND isnull(bcli.DeleteFlag,0) = 0
AND isnull(bcld.DeleteFlag,0) = 0
AND COLD_SPFS < 2
@ -354,7 +354,12 @@ class BIZ_train_model extends CI_Model {
AND COLD_SN NOT IN ( select FOI_COLD_SN from BIZ_FlightsOrderInfo where FOI_COLD_SN=COLD_SN and FOI_TrainNetOrderNo>'')
and (COLD_StartDate between GETDATE() and CONVERT(varchar(100),GETDATE()+14,23)+' 23:59')
and isnull((select top 1 ts_autotimes from InfoManager.dbo.trainsystem where ts_cold_sn= bcld.cold_sn order by ts_id desc),0)<4
order by COLD_StartDate
order by CONVERT(date,cold_startdate),ISNULL(CAST((select TOP 1 TST_saletime from TrainSaleTime where TST_station_cn = (
SELECT TOP 1 TRS_StationCN
FROM TrainStation
WHERE TRS_Code = (select top 1 DepartAirport from BIZ_FlightsOrderInfo where FOI_COLD_SN = cold_sn)
and ISNULL(TRS_StationCN,'')<>''
)) as Time),'18:00')
";
$query = $this->HT->query($sql);
return $query->result();

Loading…
Cancel
Save