From 9815becf8b799e0cc9b3b86afc7fba35d1eaae07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Thu, 4 May 2017 11:21:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E8=80=85=E5=B9=B3=E5=8F=B0=E5=A4=9A?= =?UTF-8?q?=E7=BD=91=E7=AB=99=E6=94=AF=E6=8C=81=E5=92=8C=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E5=AE=A2=E4=BA=BA=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controllers/_confirm.php | 131 ---- .../third_party/order/controllers/confirm.php | 7 + .../order/views/_confirm_order.php | 709 ------------------ .../third_party/order/views/confirm_order.php | 221 +++--- .../third_party/order/views/mailtext.php | 74 +- author/controllers/taskhall.php | 2 +- 6 files changed, 178 insertions(+), 966 deletions(-) delete mode 100644 application/third_party/order/controllers/_confirm.php delete mode 100644 application/third_party/order/views/_confirm_order.php diff --git a/application/third_party/order/controllers/_confirm.php b/application/third_party/order/controllers/_confirm.php deleted file mode 100644 index f109a090..00000000 --- a/application/third_party/order/controllers/_confirm.php +++ /dev/null @@ -1,131 +0,0 @@ -load->model('Order_model'); - } - - public function index($COLI_SN,$visitor_link,$token) - { - $data=array(); - if (empty($COLI_SN) || strtoupper(md5($visitor_link))!=strtoupper($token)) { - $this->load->view('link_tips', $data); - return false; - } - - $data['visitor_link']=$visitor_link; - $data['userinfo']=$this->Order_model->get_customer_info($COLI_SN); - $data['username']=''; - if (!empty($data['userinfo'])) { - foreach ($data['userinfo'] as $v) { - if ($v->CUL_IsLinkMan==1) { - $data['username']=$v->MEI_FirstName; - } - } - }else{ - $this->load->view('link_tips', $data); - return false; - } - - $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('link_tips', $data); - return false; - } - } - - $this->load->view('confirm_order', $data); - } - - public function save_confirm_info() - { - //客人信息 - $gender=$this->input->post('gender'); - $given_name=$this->input->post('given_name'); - $birthday=$this->input->post('birthday'); - $passport=$this->input->post('passport'); - $expiration_date=$this->input->post('passport_expiration_date'); - $nationality=$this->input->post('nationality'); - $contact_phone='座机:'.$this->input->post('landline').'/手机:'.$this->input->post('mobile'); - $COLI_SN=$this->input->post('COLI_SN'); - $visitor_link=$this->input->post('visitor_link'); - $COLI_ID=$this->input->post('COLI_ID'); - - //已经确认过 - $had_save=$this->Order_model->get_visitor_link($COLI_SN,$visitor_link); - if(!empty($had_save)){ - echo 3; - return; - } - - foreach ($this->input->post('sur_name') as $key => $name) - { - if (!empty($name)) { - if ($this->input->post('home_address')!='') { - $MEI_Street=$this->input->post('home_address'); - }elseif($this->input->post('address_street')){ - $MEI_Street=$this->input->post('address_street').','.$this->input->post('address_city').','.$this->input->post('address_state').','.$this->input->post('address_country'); - }else{ - $MEI_Street=''; - } - $MEI_FirstName=$given_name[$key]; - $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=''; - } - - $MEI_Memo=$this->input->post('special_request').' '.$CUL_Memo; - - $birthday[$key]=date('Y-m-d H:i:s',strtotime($birthday[$key])); - $expiration_date[$key]=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[$key],$birthday[$key],$MEI_Memo,$MEI_Street,'',$contact_phone,0,$COLI_SN,$visitor_link); - } - } - - 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 - ); - } - - if ($MEI_SN) { - $this->Order_model->send_mail('chinahighlights', 'service@chinahighlights.com', $this->input->post('toname'), $this->input->post('tomail'), $COLI_ID.' 团个人信息导入HT', $COLI_ID.' 团个人信息导入HT','China Highlights',$M_Web='CHT'); - echo 1; - }else{ - echo 0; - } - } - -} \ No newline at end of file diff --git a/application/third_party/order/controllers/confirm.php b/application/third_party/order/controllers/confirm.php index 68336f1a..18b30c39 100644 --- a/application/third_party/order/controllers/confirm.php +++ b/application/third_party/order/controllers/confirm.php @@ -133,4 +133,11 @@ class Confirm extends CI_Controller { } } + function review() { + $data = array(); + $data['postdata'] = $this->input->post(); + $mail_text = $this->load->view('mailtext', $data, true); + echo json_encode($mail_text); + } + } diff --git a/application/third_party/order/views/_confirm_order.php b/application/third_party/order/views/_confirm_order.php deleted file mode 100644 index ceb005b0..00000000 --- a/application/third_party/order/views/_confirm_order.php +++ /dev/null @@ -1,709 +0,0 @@ - - - - - - - www.chinahighlights.com - - - - - - - - - -
- -
- -
-
-
- -
-

Thanks booking with China Highlights!

-

Please complete and submit the information below for booking.

-
-
-
-
-
- -
-

Passenger Information

-
- -
- -
- -
-
- - -
-
-
-
-
- -
-
/
-
- -
-
-
-
-
-
- -
- - -
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- - - - -
-
- -
- -
- - Add a passenger - -
-
- -
-
- - Contact phone no.: - -
-
- -
-
- -
-
-
-
- COLI_CustomerType!=44003){ ?> -
-
- - Home Address: - - - -
-
- - -
-
-
- -
-
-
- -
-

Flight Information

-
- -
-
- - -
- -
- -
- -
-
- -
- - -
- -
- -
- -
-
- -
- -
-
-
- -
-
-
- -
-

- Special Request -

-
- -
-
-
- -
-
-
-
- -
-
-
- COLI_CustomerType!=44003){ ?> -
-
-
- -
-

- Emergency Contact Information - (in case an unlikely event happens when you are traveling) -

-
- -
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
-
-
-
- - -
- - - - - -
- -
-
Thanks,yours OPI_FirstName; ?>
-
- -
- -
-
- - - - - - - \ No newline at end of file diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index db9a5354..21d43269 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -5,16 +5,16 @@ - www.chinahighlights.com + China Highlights! Please complete and submit the information. - + - - + + @@ -26,7 +26,7 @@
@@ -63,7 +63,7 @@

Please complete and submit the information below.

-
+
@@ -502,9 +502,9 @@
@@ -578,8 +578,8 @@ Special Assistance/Disability Needs for Customers
@@ -600,7 +600,7 @@ and your confirmation code, also drug allergy just in case.
- +
Thanks,yours OPI_FirstName; ?>
@@ -633,15 +633,36 @@ and your confirmation code, also drug allergy just in case.
- + +
+
+
+
+ + + + + diff --git a/application/third_party/order/views/mailtext.php b/application/third_party/order/views/mailtext.php index e91b9e41..74d577cf 100644 --- a/application/third_party/order/views/mailtext.php +++ b/application/third_party/order/views/mailtext.php @@ -1,69 +1,71 @@ -

- Thanks for booking with China Highlights!
-For any change, please contact your travel advisor.
-

+

+ China Highlights is not responsible for any costs or consequences which may arise from failure on your part to provide correct information (For example, wrongly spelt names may cause your flight tickets to be cancelled, incorrect incoming flight number may lead to failure in pick-up etc.).
+

- Passenger Information + Passenger Information

- $sur) { ?> - -

Passenger

-

Sur name/First and Middle name:

-

Passport No.:

-

Passport Expiration Date:

-

Birthday:

+ +

Passenger

+

Sur name/First and Middle name:

+

Passport No.:

+

Passport Expiration Date:

+

Birthday:

Contact Information

-

Land line:

-

Mobile:

-

Home Address:

+

Land line:

+

Mobile:

+

Home Address:

- Flight Information + 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 + Special Request

- -
+ +

- Insurance Information + Insurance Information

- -
+ +

- Emergency Contact Information + Emergency Contact Information

- Contact person name: + Contact person name:

- Relationship with him/her: + Relationship with him/her:

- E-mail address: + E-mail address:

- Telephone no.: + Telephone no.:

\ No newline at end of file diff --git a/author/controllers/taskhall.php b/author/controllers/taskhall.php index 08d2b972..7a0a4c8c 100644 --- a/author/controllers/taskhall.php +++ b/author/controllers/taskhall.php @@ -79,7 +79,7 @@ class Taskhall extends CI_Controller { echo json_encode($data); return false; } - if (empty($task->t_a_id)) { + if ($task->t_a_id<=0) { //?н????? $this->Infotasks_model->undertake($t_id, $admin_info->a_id); $data[] = array('name' => 'ok_modal', 'value' => $this->lang->line('task_undertake_success'));