From e6ea5dfb5a58bb4ae53e84d6442572891efff7df Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 4 Jul 2018 13:40:06 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=88=97=E8=BD=A6=E8=BD=A6=E6=AC=A1=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/train/controllers/search.php | 6 ++++++ .../train/models/BIZ_intel_train_model.php | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php index 1416e5df..60156902 100644 --- a/application/third_party/train/controllers/search.php +++ b/application/third_party/train/controllers/search.php @@ -350,6 +350,12 @@ class search extends CI_Controller{ } + //获取所有的列车信息 + public function get_all_inteltrain(){ + $obj = $this->BIZ_intel_train_model->get_allinteltrain(); + print_r($obj); + } + //获取价格(废弃) /* fromStationCode：出发站三字码 diff --git a/application/third_party/train/models/BIZ_intel_train_model.php b/application/third_party/train/models/BIZ_intel_train_model.php index e9e24cb1..f0d3339d 100644 --- a/application/third_party/train/models/BIZ_intel_train_model.php +++ b/application/third_party/train/models/BIZ_intel_train_model.php @@ -80,6 +80,21 @@ 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 + "; + $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); From 36f852da9652fc5ab62555853e10b16390cfcfd0 Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 4 Jul 2018 14:13:29 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E8=BF=94=E5=9B=9Ejson=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/train/controllers/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php index 60156902..16cb31ca 100644 --- a/application/third_party/train/controllers/search.php +++ b/application/third_party/train/controllers/search.php @@ -353,7 +353,7 @@ class search extends CI_Controller{ //获取所有的列车信息 public function get_all_inteltrain(){ $obj = $this->BIZ_intel_train_model->get_allinteltrain(); - print_r($obj); + print_r(json_encode($obj)); } //获取价格(废弃) From 13943c4c920dcfe170e1513bcdc32c50b78cae96 Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 5 Jul 2018 13:52:56 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E6=8E=92=E9=99=A4=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E8=BD=A6=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/train/models/BIZ_intel_train_model.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/third_party/train/models/BIZ_intel_train_model.php b/application/third_party/train/models/BIZ_intel_train_model.php index f0d3339d..282b9aa8 100644 --- a/application/third_party/train/models/BIZ_intel_train_model.php +++ b/application/third_party/train/models/BIZ_intel_train_model.php @@ -90,6 +90,8 @@ class BIZ_intel_train_model extends CI_Model { trainlist ON s_code = trainFromCode + WHERE + trainFrom != 'NULL' "; $query = $this->HT->query($sql); return $query->result(); From 2688cd1bf0841f7f65bf9b3a55a35b56c5e865a2 Mon Sep 17 00:00:00 2001 From: MZ Date: Fri, 6 Jul 2018 14:16:21 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20cht.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/htmlcompressor/views/amp-template/cht.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/htmlcompressor/views/amp-template/cht.php b/application/third_party/htmlcompressor/views/amp-template/cht.php index 2a92f8cb..d80bad14 100644 --- a/application/third_party/htmlcompressor/views/amp-template/cht.php +++ b/application/third_party/htmlcompressor/views/amp-template/cht.php @@ -114,7 +114,7 @@ From a24049993149d538957529221ae4c0f4bcf7cf08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Mon, 9 Jul 2018 10:27:23 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E7=94=A8=E6=A0=87=E7=AD=BE=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2google=E5=88=86=E6=9E=90=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=90=A6=E5=88=99=E4=BC=9A=E7=BB=9F=E8=AE=A1=E5=88=B0=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A2=84=E8=A7=88=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=AE=BF?= =?UTF-8?q?=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/htmlcompressor/views/amp-template/ah.php | 2 +- application/views/amp_editor.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/application/third_party/htmlcompressor/views/amp-template/ah.php b/application/third_party/htmlcompressor/views/amp-template/ah.php index b224bc76..6deb1191 100644 --- a/application/third_party/htmlcompressor/views/amp-template/ah.php +++ b/application/third_party/htmlcompressor/views/amp-template/ah.php @@ -107,7 +107,7 @@ a{background-color:transparent;-webkit-text-decoration-skip:objects;color:#54545
- +@AMP-GOOGLE-ANALYTICS@ diff --git a/application/views/amp_editor.php b/application/views/amp_editor.php index bcdb60ba..3bff1bce 100644 --- a/application/views/amp_editor.php +++ b/application/views/amp_editor.php @@ -48,11 +48,13 @@ +
看看
+
- +
+ 看看 +
- +
- + config->item('site_code')=='cht'){ ?> 看看 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 09/19] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=88=AA=E7=8F=AD?= =?UTF-8?q?=E4=BF=A1=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 From 9bbd18f24dc4da5065602395d860f9cee55382bc 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 15:07:15 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=88=AA=E7=8F=AD?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/order/controllers/confirm.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/third_party/order/controllers/confirm.php b/application/third_party/order/controllers/confirm.php index bc905763..5ad43492 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; } } From ba1c8e2b6494b866cb1f2fd5e95479f3d9d0470f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Thu, 12 Jul 2018 10:27:52 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=AE=A2=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/order/views/confirm_order.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index a5a52778..70c5a3ea 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -70,7 +70,10 @@
-

Passenger Information (we need passport info for all the group members)

+

Passenger Information (we need passport info for all the group members) + Please ensure the details you provide are correct, as stated in your passport. 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! +

+