From 93372526825260be1ace17c6e36e6fc80e68ba45 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 15 May 2019 09:58:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E9=80=80=E7=A5=A8=E5=90=8E?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E7=BB=99=E5=AE=A2=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/trainsystem/controllers/addorders.php     | 8 +++++++-
 .../third_party/trainsystem/controllers/returnorders.php  | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php
index 13e874d5..9de9a291 100644
--- a/application/third_party/trainsystem/controllers/addorders.php
+++ b/application/third_party/trainsystem/controllers/addorders.php
@@ -627,7 +627,13 @@ class addorders extends CI_Controller{
 		$PostData['TrainOrderService']->Order->TicketItem->ChildTicketCount = $ChildNum;
 		$PostData['TrainOrderService']->Order->TicketItem->SeatName = $this->train_zw[$this->db_train_zw[$data['train']->Aircraft]];
 		$PostData['TrainOrderService']->Order->TicketItem->SelectedSeat = $selectseat;
-		$PostData['TrainOrderService']->Order->TicketItem->AcceptSeat = '';
+		
+		$is_accept_standing = '';
+		if($this->istanding == 'true'){
+			$is_accept_standing = '无座';
+		}
+		$PostData['TrainOrderService']->Order->TicketItem->AcceptSeat = $is_accept_standing;
+		
 		$PostData['TrainOrderService']->Order->TicketItem->passport = substr($Passport,0,strlen($Passport)-1);
 		$PostData['TrainOrderService']->Order->TicketItem->OrderPrice = $data['train']->adultcost * $AdultNum + $data['train']->childcost * $ChildNum;
 		
diff --git a/application/third_party/trainsystem/controllers/returnorders.php b/application/third_party/trainsystem/controllers/returnorders.php
index d2ca666f..0742d87f 100644
--- a/application/third_party/trainsystem/controllers/returnorders.php
+++ b/application/third_party/trainsystem/controllers/returnorders.php
@@ -102,10 +102,10 @@ class returnorders extends CI_Controller{
 			$this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body);
 			//发送邮件给客人
 			$customer_subject = 'returntickets';
-			$customer_body = '<p>Dear '.$data->tst_realname.',</p><p>Your tickets (for name '.$data->tst_realname.',train No. '.$back_detail_data->result->checi.') have been cancelled online successfully. Your travel advisor ('.$toName.',email address:'.$toEmail.',phone number (+86)'.$Mobile.') will contact you with the refund details via email within 24 hours.';
+			$customer_body = '<p>Dear '.$data->tst_realname.',</p><p>Your tickets (for name '.$data->tst_realname.',train No. '.$back_detail_data->result->checi.') have been cancelled online successfully. Your travel advisor ('.$toName.',email address:'.$toEmail.',phone number '.$Mobile.') will contact you with the refund details via email within 24 hours.';
 			$customer_email = $this->BIZ_train_model->get_guest_info($coli_id);
 			$customer_email = $customer_email[0]->GUT_Email;
-			$this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,'cyc@hainatravel.com',$customer_subject,$customer_body);
+			$this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,$customer_email,$customer_subject,$customer_body);
 			echo '{"reason":"退票成功","status":"200"}';
 		}else{
 			//退票失败后发送邮件
@@ -114,10 +114,10 @@ class returnorders extends CI_Controller{
 			$this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body);
 			//发送邮件给客人
 			$customer_subject = 'returntickets';
-			$customer_body = '<p>Dear '.$data->tst_realname.',</p><p>Your application for online ticket cancellation (for name '.$data->tst_realname.', train No.'.$back_detail_data->result->checi.') has failed.Your travel advisor('.$toName.', email address: '.$toEmail.', phone number (+86)'.Mobile.') will contact you via email within 24 hours. Please call us if you need to contact us urgently.</p>';
+			$customer_body = '<p>Dear '.$data->tst_realname.',</p><p>Your application for online ticket cancellation (for name '.$data->tst_realname.', train No.'.$back_detail_data->result->checi.') has failed.Your travel advisor('.$toName.', email address: '.$toEmail.', phone number '.Mobile.') will contact you via email within 24 hours. Please call us if you need to contact us urgently.</p>';
 			$customer_email = $this->BIZ_train_model->get_guest_info($coli_id);
 			$customer_email = $customer_email[0]->GUT_Email;
-			$this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,'cyc@hainatravel.com',$customer_subject,$customer_body);
+			$this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,$customer_email,$customer_subject,$customer_body);
 			header("HTTP/1.1 404 Not Found");
 			echo '{"reason":"退票失败","status":"404"}';
 		}