From f2c56e82dd489f3e6f6985d2350b1f650bf9bdaa Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Wed, 7 Jun 2023 11:41:51 +0800 Subject: [PATCH 01/11] =?UTF-8?q?AH=20=E6=97=A5=E6=9C=9F=E5=92=8C=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=88=86=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/order/controllers/confirm.php | 19 ++--- .../order/views/ah/confirm_order.php | 48 ++---------- .../third_party/order/views/ah/mailtext.php | 76 +++++++++++++++++++ 3 files changed, 93 insertions(+), 50 deletions(-) create mode 100644 application/third_party/order/views/ah/mailtext.php diff --git a/application/third_party/order/controllers/confirm.php b/application/third_party/order/controllers/confirm.php index 7f3e17b9..a6a9177c 100644 --- a/application/third_party/order/controllers/confirm.php +++ b/application/third_party/order/controllers/confirm.php @@ -89,10 +89,10 @@ class Confirm extends CI_Controller { $COLI_ID = $this->input->post('COLI_ID'); //航班信息 $MEI_ArrivalFlightNo = $this->input->post('MEI_ArrivalFlightNo'); - // HTML datetime-local 获取的值：2023-05-29T15:45，需要替换 T 为空格才能符合数据类型 - $MEI_ArrivalTime = str_replace("T", " ", $this->input->post('MEI_ArrivalTime')); $MEI_DepartureFlightNo = $this->input->post('MEI_DepartureFlightNo'); - $MEI_DepartureTime = str_replace("T", " ", $this->input->post('MEI_DepartureTime')); + // HTML datetime-local 获取的值：2023-05-29T15:45，需要替换 T 为空格才能符合数据类型 + $MEI_ArrivalTime = str_replace("T", " ", $this->input->post('MEI_ArrivalDate').' '.$this->input->post('MEI_ArrivalTime')); + $MEI_DepartureTime = str_replace("T", " ", $this->input->post('MEI_DepartureDate').' '.$this->input->post('MEI_DepartureTime')); //已经确认过 @@ -159,13 +159,14 @@ class Confirm extends CI_Controller { } } - //只有ch有review功能 function review() { - header('Content-type: application/json;charset=utf-8'); - $data = array(); - $data['postdata'] = $this->input->post(); - $mail_text = $this->load->view('mailtext', $data, true); - echo json_encode($mail_text); + header('Content-type: application/json;charset=utf-8'); + $data = array(); + $site_code = $this->input->get('site_code'); + $viewName = $site_code.'/mailtext'; + $data['postdata'] = $this->input->post(); + $mail_text = $this->load->view($viewName, $data, true); + echo json_encode($mail_text); } } diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index cb8e055e..5656f3e6 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/confirm_order.php @@ -767,9 +767,10 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + +
@@ -783,9 +784,10 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + +
@@ -928,7 +930,7 @@ select.gender_pick {border: 1px solid #d1d1d1; type: "post", dataType: "json", data: $("#form-confirm-info").serialize(), - url: 'https://www.chinahighlights.com/secureinfoconfirm/confirm/review', + url: 'https://www.chinahighlights.com/secureinfoconfirm/confirm/review?site_code=ah', success: function(data, textStatus) { $('#reviewModal_body').html(data); $('#reviewModal').modal('show'); @@ -947,42 +949,6 @@ select.gender_pick {border: 1px solid #d1d1d1; var travelerCount = $(".traveler_info").length + 1; $addTraveler.find('[data-header]').text('Traveler ' + travelerCount); $('#add_traveler_button').before($addTraveler); - - $('.datepicker').datepicker({ - controlType: 'select', - oneLine: true, - changeMonth: true, - changeYear: true, - yearRange: '2010:2055', - timeFormat: 'mm/dd/yy' - }); - - $('.datetimepicker').datetimepicker({ - controlType: 'select', - oneLine: true, - changeMonth: false, - changeYear: false, - timeFormat: 'H:mm' - }); - - }); - - - $('.datepicker').datepicker({ - controlType: 'select', - oneLine: true, - changeMonth: true, - changeYear: true, - yearRange: '2010:2055', - timeFormat: 'mm/dd/yy' - }); - - $('.datetimepicker').datetimepicker({ - controlType: 'select', - oneLine: true, - changeMonth: false, - changeYear: false, - timeFormat: 'H:mm' }); }); diff --git a/application/third_party/order/views/ah/mailtext.php b/application/third_party/order/views/ah/mailtext.php new file mode 100644 index 00000000..993027c8 --- /dev/null +++ b/application/third_party/order/views/ah/mailtext.php @@ -0,0 +1,76 @@ +

+ 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 +

+ $sur) { ?> + +

Passenger

+

Sur name/First and Middle name:

+

Passport No.:

+

Passport Expiration Date:

+

Birthday:

+ + +

Contact Information

+

Land line:

+

Mobile:

+ +

+ Flight Information +

+

Arrival Flight No.:

+

+ Arrival date: +

+

+ Arrival time: +

+

+ Departure Flight no.: +

+

+ Departure date: +

+

+ Departure time: +

+

+ Special Request +

+

+ +
+

+

+ Insurance Information +

+

+ +
+

+

+ Emergency Contact Information +

+

+ Contact person name: +

+

+ Relationship with him/her: +

+

+ E-mail address: +

+

+ Telephone no.: +

\ No newline at end of file From be6f6d615e82932f20dc2f0487413fe05f9f51ef Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 7 Jun 2023 17:08:39 +0800 Subject: [PATCH 02/11] =?UTF-8?q?CH=E6=96=87=E4=B8=AD=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=B9=BF=E5=91=8A=E4=BB=A3=E7=A0=81=20=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/recommend/views/templates.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/third_party/recommend/views/templates.php b/application/third_party/recommend/views/templates.php index 1232c0f3..96d0483b 100644 --- a/application/third_party/recommend/views/templates.php +++ b/application/third_party/recommend/views/templates.php @@ -1,4 +1,4 @@ -

CH文中信息广告代码：

+

CH文中tour广告代码：

From 49f8eb387007dc03d21008b10aa2cdcb314a196b Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Thu, 8 Jun 2023 09:51:21 +0800 Subject: [PATCH 03/11] add InfoMetas_model --- .../views/bootstrap3/information_edit.php | 4333 ++++++++++------- 1 file changed, 2440 insertions(+), 1893 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index eee416f0..efd6c16b 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -2,611 +2,625 @@ ?>
-
- -
+ +