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

application/models/infoMetas_model.php

@@ -75,7 +75,7 @@ class InfoMetas_model extends CI_Model {
                        AND c.ic_sitecode = ?
                        AND c.ic_status = 1
                        AND CONVERT(varchar, im2.im_value) = '1'
-                ) AND c0.ic_sitecode = ? AND c0.ic_status = 1 AND c0.ic_url <> ''
+                ) AND c0.ic_sitecode = ? AND c0.ic_status = 1 AND c0.ic_url <> '' AND datalength(c0.ic_content) > 0
         ";
         $query = $this->HT->query($sql, array($site_code, $site_code));
         return $query->result();

application/third_party/htmlcompressor/views/amp-template/ah.php

@@ -107,7 +107,7 @@ a{background-color:transparent;-webkit-text-decoration-skip:objects;color:#54545
 </footer>
 
 <amp-animation id="showAnim"layout="nodisplay"><script type="application/json">{"duration":"200ms","fill":"both","iterations":"1","direction":"alternate","animations":[{"selector":"#scrollToTopButton","keyframes":[{"opacity":"1","visibility":"visible"}]}]}</script></amp-animation><amp-animation id="hideAnim"layout="nodisplay"><script type="application/json">{"duration":"200ms","fill":"both","iterations":"1","direction":"alternate","animations":[{"selector":"#scrollToTopButton","keyframes":[{"opacity":"0","visibility":"hidden"}]}]}</script></amp-animation><div id="marker"><amp-position-observer on="enter:hideAnim.start; exit:showAnim.start"layout="nodisplay"></amp-position-observer></div><a id="scrollToTopButton"on="tap:top-page.scrollTo(duration=200)"class="scrollToTop"></a>
-<amp-analytics type="googleanalytics"><script type="application/json">{"vars": {"account": "UA-75142970-1"},"triggers": { "default pageview": {"on": "visible", "request": "pageview","vars": {"title": "<!--@TITLE@-->"}}}}</script></amp-analytics>
+@AMP-GOOGLE-ANALYTICS@
 <!--AMP Builder-->
 </body>
 </html>

application/third_party/htmlcompressor/views/amp-template/cht.php

@@ -114,7 +114,7 @@
 
 <footer>
   <div class="footerLink"><a href="/contactus/" >Contact us</a> | <a href="/aboutus/" >About us</a></div>
-  <div class="copyright">© 1997-2018 China Highlights</div>
+  <div class="copyright">© 1998-2018 China Highlights</div>
 </footer>
 <!-- Google Analytics -->
 <amp-analytics type="googleanalytics">

application/third_party/order/controllers/confirm.php

@@ -57,6 +57,11 @@ class Confirm extends CI_Controller {
         $COLI_SN = $this->input->post('COLI_SN');
         $visitor_link = $this->input->post('visitor_link');
         $COLI_ID = $this->input->post('COLI_ID');
+        //航班信息
+        $MEI_ArrivalFlightNo = $this->input->post('MEI_ArrivalFlightNo');
+        $MEI_ArrivalTime = $this->input->post('MEI_ArrivalTime');
+        $MEI_DepartureFlightNo = $this->input->post('MEI_DepartureFlightNo');
+        $MEI_DepartureTime = $this->input->post('MEI_DepartureTime');
 
 
         //已经确认过
@@ -85,25 +90,11 @@ class Confirm extends CI_Controller {
 
                 $MEI_LastName = $name;
 
-                if ($this->input->post('arrive_flight')) {
+                $CUL_Memo = $this->input->post('insurance_information');
-                    $CUL_Memo = 'Arrival China Flight No : '
-                            . $this->input->post('arrive_flight')
-                            . ' & Arrival time : '
-                            . $this->input->post('arrive_time')
-                            . ' & Departure China Flight no : '
-                            . $this->input->post('departure_flight')
-                            . ' & Departure time : '
-                            . $this->input->post('depart_time');
-                } else {
-                    $CUL_Memo = '';
-                }
-                $CUL_Memo .= $this->input->post('insurance_information');
 
                 $MEI_Memo = $this->input->post('special_request') . ' ' . $CUL_Memo;
 
-                //$birthday[$key] = date('Y-m-d H:i:s', strtotime($birthday[$key]));
                 $birthday_tmp = date('Y-m-d H:i:s', strtotime($birthday[$key]));
-                //$expiration_date[$key] = date('Y-m-d H:i:s', strtotime($expiration_date[$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);
@@ -113,6 +104,7 @@ class Confirm extends CI_Controller {
         if ($MEI_SN && $this->input->post('emergency_person_name') != '') {
             $add_emergency_res = $this->Order_model->add_customer_info(
                     '', '', $this->input->post('emergency_person_name'), '', '', '', '', $this->input->post('emergency_relationship'), '', $this->input->post('emergency_email'), $this->input->post('emergency_telephone'), 1, $COLI_SN, $visitor_link
+                ,$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime
             );
         }
 

application/third_party/order/models/order_model.php

@@ -43,7 +43,7 @@ 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='')
+    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)
     {
         $createdate=date('Y-m-d H:i:s');
         $sql="INSERT INTO MEmberInfoTmpCheck 
@@ -69,9 +69,13 @@ class Order_model extends CI_Model {
                     visitor_link,
                     CreateDate,
                     CUL_IsLinkMan,
-                    copyState
+                    copyState,
-                ) VALUES (?,?,?,?,?,?,?,?,?,?,?,102001,0,0,1,1,?,?,?,?,0,0) ";
+                    MEI_ArrivalFlightNo,
-        $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_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));
         $insertid = $this->HT->last_id('MEmberInfoTmpCheck');//$this->HT->insert_id();
         return $insertid;
     }

application/third_party/order/views/confirm_order.php

@@ -70,7 +70,10 @@
                             <div class="panel-body">
 
                                 <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></h4>
+                                    <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/>
+									<small class="text-muted" style="font-size:15px;">Please ensure the details you provide are <span class="text-red">correct, as stated in your passport.</span>  We use this information to book all your hotels and transportation.  If the name you provide are incorrect, you would not be able to board your flight or trains in China, and therefore reissuing of tickets would be at your expense! </small>
+									</h4>
+									
                                 </div>
 
                                 <div class="col-xs-24 nopadding hidden-xs">
@@ -461,25 +464,25 @@
                                 <div class="col-xs-24 flight-info-box">
                                     <div class="form-group col-sm-6 nopadding">
                                         <label>Arrival China Flight No.</label>
-                                        <input type="text" class="form-control input-sm" name="arrive_flight" value=""  data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your Flight No.!">
+                                        <input type="text" class="form-control input-sm" name="MEI_ArrivalFlightNo" value=""  data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your Flight No.!">
                                     </div>
 
                                     <div class="form-group col-sm-6 nopadding-R">
                                         <label>Arrival time</label>
                                         <div class="input-groups date" >
-                                            <input class="form-control input-sm f_datepicker" type="text" name="arrive_time" value="" autocomplete="off" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your arrival time!" style="color:#333333 !important;">
+                                            <input class="form-control input-sm f_datepicker" type="text" name="MEI_ArrivalTime" value="" autocomplete="off" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your arrival time!" style="color:#333333 !important;">
                                         </div>
                                     </div>
 
                                     <div class="form-group col-sm-6 nopadding-R">
                                         <label>Departure China Flight no.</label>
-                                        <input type="text" class="form-control input-sm" name="departure_flight" value="" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your flight no.!">
+                                        <input type="text" class="form-control input-sm" name="MEI_DepartureFlightNo" value="" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your flight no.!">
                                     </div>
 
                                     <div class="form-group col-sm-6 nopadding-R">
                                         <label>Departure time</label>
                                         <div class="input-groups date ">
-                                            <input class="form-control input-sm f_datepicker" type="text" name="depart_time" value="" autocomplete="off" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your departure time!" style="color:#333333 !important;">
+                                            <input class="form-control input-sm f_datepicker" type="text" name="MEI_DepartureTime" value="" autocomplete="off" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your departure time!" style="color:#333333 !important;">
                                         </div>
                                     </div>
 

application/third_party/order/views/mailtext.php

@@ -30,15 +30,15 @@
 <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 China Flight No.:<?php if (isset($postdata['arrive_flight'])) echo $postdata['arrive_flight']; ?></p>
+<p style="margin:0;">Arrival China Flight No.:<?php if (isset($postdata['MEI_ArrivalFlightNo'])) echo $postdata['MEI_ArrivalFlightNo']; ?></p>
 <p style="margin:0;">
-    Arrival time:<?php if (isset($postdata['arrive_time'])) echo $postdata['arrive_time']; ?>
+    Arrival time:<?php if (isset($postdata['MEI_ArrivalTime'])) echo $postdata['MEI_ArrivalTime']; ?>
 </p>
 <p style="margin:0;">
-    Departure China Flight no.:<?php if (isset($postdata['departure_flight'])) echo $postdata['departure_flight']; ?>
+    Departure China Flight no.:<?php if (isset($postdata['MEI_DepartureFlightNo'])) echo $postdata['MEI_DepartureFlightNo']; ?>
 </p>
 <p style="margin:0;">
-    Departure time:<?php if (isset($postdata['depart_time'])) echo $postdata['depart_time']; ?>
+    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

application/third_party/train/controllers/search.php

@@ -85,23 +85,27 @@ class search extends CI_Controller{
 			$this->BIZ_train_model->addOrUpdate($fromStation,$toStation,$search_return);
 			$operate_data = $search_return;
 		}else{
-			$cache_train_info = $this->BIZ_train_model->get_train_info($fromStation,$toStation);
+			if($this->seveth == 'yes'){
-			if(empty($cache_train_info)){
+				$cache_train_info = $this->BIZ_train_model->get_train_info($fromStation,$toStation);
-				log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|缓存为空');
+				if(empty($cache_train_info)){
-				$operate_data = NULL;
+					log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|缓存为空');
-			}else{
-				$cache_time = $cache_train_info->tpc_datetime;
-				$now_time = time();
-				$differ_time = ($now_time - strtotime($cache_time)) / 86400;
-				if($differ_time >= 3){
-					$this->BIZ_train_model->delete_traincache($fromStation,$toStation);
-					log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|缓存超时,已经删除');
 					$operate_data = NULL;
 				}else{
-					$this->cache = 'yes';
+					$cache_time = $cache_train_info->tpc_datetime;
-					$operate_data = $cache_train_info->tpc_content;
+					$now_time = time();
-					log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|调用缓存号：'.$cache_train_info->tpc_sn.'|缓存生成的时间:'.$cache_train_info->tpc_datetime);
+					$differ_time = ($now_time - strtotime($cache_time)) / 86400;
-				}	
+					if($differ_time >= 3){
+						$this->BIZ_train_model->delete_traincache($fromStation,$toStation);
+						log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|缓存超时,已经删除');
+						$operate_data = NULL;
+					}else{
+						$this->cache = 'yes';
+						$operate_data = $cache_train_info->tpc_content;
+						log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|调用缓存号：'.$cache_train_info->tpc_sn.'|缓存生成的时间:'.$cache_train_info->tpc_datetime);
+					}
+				}
+			}else{
+				$operate_data = NULL;
 			}
 		}
 		return $operate_data;
@@ -350,6 +354,12 @@ class search extends CI_Controller{
 	    
 	}
 	
+	//获取所有的列车信息
+	public function get_all_inteltrain(){
+		$obj = $this->BIZ_intel_train_model->get_allinteltrain();
+		print_r(json_encode($obj));
+	}
+	
 	//获取价格(废弃)
 	/*
 	fromStationCode：出发站三字码
@@ -547,7 +557,7 @@ class search extends CI_Controller{
         curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址  
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查  
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); // 从证书中检查SSL加密算法是否存在  
-        curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器  
+        //curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器  
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转  
         curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer  
         if ($method == 'POST' && !empty($data)) {

application/third_party/train/models/BIZ_intel_train_model.php

@@ -21,9 +21,10 @@ class BIZ_intel_train_model extends CI_Model {
 						tl.trainUse,
 						tl.RunTime,
 						tl.departTime,
-						tl.arriveTime,
+						(select top 1  trainArrive from trainlistDetail where train_no = tl.train_no order by trainOrder desc) as arriveTime,
 						tl.UseDay,
 						tl.DateRule,
+						tl.TrainMessage,
 						tp.seatPriceInfo2
 				  FROM
 						trainlist tl
@@ -41,6 +42,8 @@ class BIZ_intel_train_model extends CI_Model {
 						tl.DateRule != ''
 				   AND
 						tp.seatPriceInfo2 IS NOT NULL
+				   order by 
+						departTime asc			
 				";
 		$query = $this->HT->query($sql);
         return $query->result();						
@@ -80,6 +83,23 @@ class BIZ_intel_train_model extends CI_Model {
         return $query->row();			
 	}
 	
+	public function get_allinteltrain(){
+		$sql = "
+				SELECT 
+						*
+				  FROM
+						TrainStation_intel
+			 LEFT JOIN
+						trainlist
+					ON
+						s_code = trainFromCode
+				 WHERE 
+						trainFrom != 'NULL'
+				";
+		$query = $this->HT->query($sql);
+	    return $query->result();			
+	}
+	
 	public function get_seat_info($seat_code){
 	    $sql = "SELECT Seat_CName,Seat_EName1 FROM TrainSeat_Intel WHERE Seat_Code = '{$seat_code}'";
 	    $query = $this->HT->query($sql);
@@ -87,7 +107,7 @@ class BIZ_intel_train_model extends CI_Model {
 	}
 	
 	public function get_train_station($train_no){
-	    $sql = "SELECT * FROM trainlistDetail WHERE train_no = '{$train_no}'";
+	    $sql = "SELECT * FROM trainlistDetail WHERE train_no = '{$train_no}' order by trainOrder asc";
 	    $query = $this->HT->query($sql);
 	    return $query->result();
 	}

application/views/amp_editor.php

@@ -48,11 +48,15 @@
                     </option>
                 </select>
             </div>
+
             <div class="col-sm-4">
                 <button type="button" class="btn btn-primary" onclick="submit_amp_editor();">保存</button>
+                <?php if($this->config->item('site_code')=='cht'){ ?>
                 <a href="http://192.155.224.195:8080/guide-use.php/amp_loader/test/?info_url=<?php echo $information->ic_url ?>"
                    target="_blank">看看</a>
+                <?php } ?>
             </div>
+
             <div class="col-sm-4">
                 <button type="button" class="btn btn-default"
                         onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'AMP', ''); meta('delete', '<?php echo $information->ic_id; ?>', 'AMP_STATUS', '');">
@@ -115,6 +119,8 @@
                     editor.setValue(field.amp);
                 }
             });
+            $(obj).text('转换完成!');
+            $(obj).enable(true);
         });
 
     }

application/views/bootstrap3/information_edit.php

@@ -556,7 +556,9 @@
                                     $amp_photo = $this->config->item('site_image_url').$information->ic_photo;
                                 }
                                 ?>
+                                <?php if(is_series_site()){ ?>
                                 <label title="AMP页面编辑"><a href="/amp_app/?icid=<?php echo($information->ic_id); ?>&is_path=<?php echo($information->is_path); ?>&usr=<?php echo(urlencode($amp_user['OPI_Name'])); ?>&url=<?php echo(urlencode($information->ic_url)); ?>&photo=<?php echo(urlencode($amp_photo)); ?>&site=<?php echo(urlencode($this->config->item('site_url'))); ?>&imgurl=<?php echo(urlencode($this->config->item('site_image_url'))); ?>" target="_blank">AMP构建工具</a></label> |
+                                <?php } ?>
                                 <?php if (get_meta($information->ic_id, 'AMP_STATUS') === '1') {?>
                                     <label title="AMP页面编辑"><a href="<?php echo site_url('amp/edit/' . $information->ic_id); ?>" target="_blank"><i class="glyphicon glyphicon-flash"></i></a></label>
                                 <?php } else {?>