From 270bf40b8c657d4a668f88ade26e4bb0baef1763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Tue, 10 Jul 2018 14:58:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=88=AA=E7=8F=AD=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/order/controllers/confirm.php | 26 +++++++------------ .../third_party/order/models/order_model.php | 12 ++++++--- .../third_party/order/views/confirm_order.php | 8 +++--- .../third_party/order/views/mailtext.php | 8 +++--- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/application/third_party/order/controllers/confirm.php b/application/third_party/order/controllers/confirm.php index 4dda6cd4..bc905763 100644 --- a/application/third_party/order/controllers/confirm.php +++ b/application/third_party/order/controllers/confirm.php @@ -37,8 +37,8 @@ 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; + // $this->load->view($site_code.'/link_tips', $data); + // return false; } } @@ -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 = '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'); + $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 ); } diff --git a/application/third_party/order/models/order_model.php b/application/third_party/order/models/order_model.php index be036f56..9ba407c6 100644 --- a/application/third_party/order/models/order_model.php +++ b/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 - ) 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)); + copyState, + MEI_ArrivalFlightNo, + 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; } diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index 1661dcd2..a5a52778 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -461,25 +461,25 @@
- +
- +
- +
- +
diff --git a/application/third_party/order/views/mailtext.php b/application/third_party/order/views/mailtext.php index 74d577cf..fc6b27eb 100644 --- a/application/third_party/order/views/mailtext.php +++ b/application/third_party/order/views/mailtext.php @@ -30,15 +30,15 @@

Flight Information

-

Arrival China Flight No.:

+

Arrival China Flight No.:

- Arrival time: + Arrival time:

- Departure China Flight no.: + Departure China Flight no.:

- Departure time: + Departure time:

Special Request