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

application/third_party/order/controllers/confirm.php

@@ -94,21 +94,7 @@ class Confirm extends CI_Controller {
         $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'));
 
-        // SQL Server datetime 类型的最小值和最大值
-        $min_date = '1753-01-01';
-        $max_date = '9999-12-31 23:59:59';
-        $min_datetime = new DateTime($min_date);
-        $max_datetime = new DateTime($max_date);
 
-        $MEI_Arrival_datetime = new DateTime($MEI_ArrivalTime);
-        $MEI_Departure_datetime = new DateTime($MEI_DepartureTime);
-
-        if ($MEI_Arrival_datetime < $min_datetime || $MEI_Arrival_datetime > $max_datetime) {
-          $MEI_ArrivalTime = NULL;
-        }
-        if ($MEI_Departure_datetime < $min_datetime || $MEI_Departure_datetime > $max_datetime) {
-          $MEI_DepartureTime = NULL;
-        }
         //已经确认过
         $had_save = $this->Order_model->get_visitor_link($COLI_SN, $visitor_link);
 		

application/third_party/trainsystem/controllers/addorders.php

@@ -210,7 +210,7 @@ class addorders extends CI_Controller{
 					$back_message .= '-此用户为黑名单用户，不自动出票';
 				}
 				
-				if(strlen($people_info->BPE_Passport) > 18){
+				if(strlen($people_info->BPE_Passport) >= 18){
 					$auto_flag = 0;
 					$back_message .= '-护照位数大于18不自动出票';
 				}
@@ -252,8 +252,7 @@ class addorders extends CI_Controller{
 				if(!empty($time_obj)){
 					$saletime = strtotime($time_obj->TST_saletime);
 				}else{
-					$saletime = strtotime("18:00");  //如果没有设置预售时间，默认18点
+					$saletime = strtotime("12:00");  //如果没有设置预售时间，默认8点
-					$back_message .= '-没设置预售时间';
 				}
 				//echo $saletime;
 				$sale_diff = (time() - $saletime) / 3600;
@@ -289,7 +288,7 @@ class addorders extends CI_Controller{
 				if($depart_diff==14){
 
 				}else{
-					log_message('error','自动出票错误信息：'.'<table border="1">'.$string.'</table>');			
+					log_message('error','自动出票错误信息：'.'<table border="1">'.$string.'</table>');				
 				}
 				
 			}else{

application/third_party/trainsystem/models/BIZ_train_model.php

@@ -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 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 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
 		,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
@@ -354,12 +354,7 @@ 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 	ISNULL(CAST((select TST_saletime from TrainSaleTime where TST_station_cn =	(
+			order by COLD_StartDate
-                               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();

application/views/mobile_first/ch-daytours-detail.php

@@ -2,7 +2,7 @@
 <div class="mbottom30 TA_box">
     <div id="TA_selfserveprop869" class="TA_selfserveprop">
         <ul id="nIy5GW" class="TA_links mzjWpb">
-            <li id="njsYKpl5CGUI" class="HvAhA1TDlL"><a target="_blank" href="https://www.tripadvisor.com/Attraction_Review-g294212-d4006739-Reviews-The_Trippest_Mini_Group_Tours-Beijing.html" rel="nofollow"><img src="https://www.tripadvisor.com/img/cdsi/img2/branding/v2/Tripadvisor_lockup_horizontal_secondary_registered-11900-2.svg" alt="TripAdvisor" width="150px" /></a></li>
+            <li id="njsYKpl5CGUI" class="HvAhA1TDlL"><a target="_blank" href="https://www.tripadvisor.com/Attraction_Review-g294212-d4006739-Reviews-The_Trippest_Mini_Group_Tours-Beijing.html"><img src="https://www.tripadvisor.com/img/cdsi/img2/branding/v2/Tripadvisor_lockup_horizontal_secondary_registered-11900-2.svg" alt="TripAdvisor" width="150px" /></a></li>
         </ul>
     </div>
     <script async src="https://www.jscache.com/wejs?wtype=selfserveprop&amp;uniq=869&amp;locationId=4006739&amp;lang=en_US&amp;rating=true&amp;nreviews=4&amp;writereviewlink=true&amp;popIdx=true&amp;iswide=true&amp;border=true&amp;display_version=2" data-loadtrk onload="this.loadtrk=true"></script>
@@ -289,11 +289,6 @@
             }
         });
 
-        $(".inquirybutton").click(function(e){
-            const element = document.getElementById("inquirybutton");
-            element.scrollIntoView({ behavior: 'smooth' });
-        })
-
     })
 
     function CheckSubmit(){

application/views/mobile_first/ch-pc.php

@@ -233,11 +233,7 @@
                             <li class="start-nav-item"><a href="/travelguide/traditional-chinese-clothes.htm"
                                     id="culture_clothes">Chinese Clothes</a></li>
                             <li class="start-nav-item"><a href="/travelguide/kungfu/" id="culture_kungfu">Chinese Kung
-                                    Fu</a></li>
+                                    Fu</a></li>                           
-                            <li class="start-nav-item"><a href="/zodiac-signs/" id="culture_zodiac_signs">Zodiac
-                                    Signs</a></li>
-                            <li class="start-nav-item"><a href="/travelguide/culture/dream-meanings.htm"
-                                    id="culture_dream_meanings">Dream Meanings</a></li>
                             <li class="start-nav-item start-nav-item-last"><a href="/palm-reading/"
                                     id="culture_palm_reading">Palm Reading</a></li>
 

application/views/mobile_first/ch-train-index.php

@@ -29,7 +29,7 @@
             </div>
             <div id="aR_tr" class="addTr">
                 <div class="searchBtn"><button type="submit" name="button" id="SearchTrainButton" value="" class="searchButtonLong">SEARCH</button>
-                    <a class="shopcart hidden-xs" rel="nofollow" target="blank" href="https://biz.chinahighlights.com/china-trains/shopcart.asp" ><span id="shoppingnum" class="shopping-num default">0</span>Cart <i class="downarrow"></i></a>
+                    <a class="shopcart hidden-xs" href="https://biz.chinahighlights.com/china-trains/shopcart.asp" ><span id="shoppingnum" class="shopping-num default">0</span>Cart <i class="downarrow"></i></a>
                 </div>
 
             </div>

application/views/mobile_first/ch.php

@@ -273,10 +273,6 @@
             id="culture_clothes_mobile">Chinese Clothes</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/travelguide/kungfu/"
             id="culture_kungfu_mobile">Chinese Kung Fu</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/zodiac-signs/"
-            id="culture_zodiac_signs_mobile">Zodiac Signs</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/travelguide/culture/dream-meanings.htm"
-            id="culture_dream_meanings_mobile">Dream Meanings</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/palm-reading/"
             id="culture_palm_reading_mobile">Palm Reading</a></li>
       </ul>
@@ -328,7 +324,6 @@
         <li class="menu__item" role="menuitem"><a
             href="https://www.asiahighlights.com/caucasus-central-asia/tours/kyrgyzstan-uzbekistan-turkmenistan" rel="nofollow"
             class="menu__link" target="_blank">China-Kyrgyzstan-Uzbekistan-Turkmenistan</a></li>
-
       </ul>
 
     </div>