From 000fca2debaa8f1eab4cb025d92c6abc0857376e Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 22 Dec 2023 14:17:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?TODO:=20=E9=9D=9E=E5=AD=90=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 45 +++++++++++++++---------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 175983ee..32964819 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -138,9 +138,7 @@ class Information extends CI_Controller foreach ($src_path as $n => $item) { if ($item->is_parent_id == $src->is_id) { // info_content - echo $item->is_ic_id . ' @ '; $item_info_content = $this->InfoContents_model->get_ic_contents2($item->is_ic_id); - $this->InfoContents_model->Add_with_sitecode( $item_info_content->ic_url, $item_info_content->ic_url_title, @@ -166,19 +164,30 @@ class Information extends CI_Controller $item_info_content->ic_author, $dest->is_sitecode ); + // info_meta - $item_meta_amp = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP'); - $item_meta_ampstatus = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_STATUS'); - $item_meta_pcstatus = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_BODY_PC_STATUS'); - $item_meta_pcbody = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_BODY_PC'); - $item_meta_pccss = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_CSS_PC'); - $item_meta_pcschema = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_SCHEMA'); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_STATUS', $item_meta_ampstatus); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC_STATUS', $item_meta_pcstatus); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC', $item_meta_pcbody); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_CSS_PC', $item_meta_pccss); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCHEMA', $item_meta_pcschema); + $item_meta_amp = $this->InfoMetas_model->get($item->is_ic_id, 'AMP'); + $item_meta_ampjson = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_JSON'); + $item_meta_ampstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_STATUS'); + $item_meta_pcstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC_STATUS'); + $item_meta_pcbody = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC'); + $item_meta_pccss = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_CSS_PC'); + $item_meta_pcschema = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_SCHEMA'); + + if (!empty($item_meta_amp)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); + if (!empty($item_meta_ampjson)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_JSON', $item_meta_ampjson); + if (!empty($item_meta_ampstatus)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_STATUS', $item_meta_ampstatus); + if (!empty($item_meta_pcstatus)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC_STATUS', $item_meta_pcstatus); + if (!empty($item_meta_pcbody)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC', $item_meta_pcbody); + if (!empty($item_meta_pccss)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_CSS_PC', $item_meta_pccss); + if (!empty($item_meta_pcschema)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCHEMA', $item_meta_pcschema); // 添加节点 $this->InfoStructures_model->Add_with_sitecode($dest->is_id, $this->InfoContents_model->insert_id, 999, $dest->is_sitecode); @@ -219,10 +228,10 @@ class Information extends CI_Controller $info_detail = $this->Information_model->Detail($is_id); //删除前，备份amp的meta标签-isid。 - $meta_value = $this->InfoMetas_model->get($info_detail->ic_id, 'AMP_JSON'); - if ($meta_value) { - $this->Logs_model->backup_meta($info_detail->ic_id, $meta_value, 'AMP_JSON_' . $is_id); - } + //$meta_value = $this->InfoMetas_model->get($info_detail->ic_id, 'AMP_JSON'); + //if ($meta_value) { + // $this->Logs_model->backup_meta($info_detail->ic_id, $meta_value, 'AMP_JSON_' . $is_id); + //} $this->Logs_model->delete($is_id, $info_detail->ic_content); if (!empty($info_detail->ic_summary)) { From 0e5f3e708d9f6a44de502d09870fa2d95c10089f Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Fri, 22 Dec 2023 14:33:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E4=BA=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E8=A1=A8=E5=8D=95=E4=BC=98=E5=8C=96=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/views/ah/confirm_order.php | 1896 ++++++++--------- .../order/views/gh/confirm_order.php | 1884 ++++++++-------- 2 files changed, 1862 insertions(+), 1918 deletions(-) diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index 6d6b1f02..f4278762 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/confirm_order.php @@ -1,963 +1,935 @@ - - - - - - - Passport Information for All the Group Members - - - - - - - - - - -
- -

Dear ,

- -

Thanks for booking with us. China Highlights, Asia Highlights, and Global Highlights are - working together to provide you an exclusive, exciting, and worry-free tour experience in different - destinations.

- -

Please complete and submit the information below.

- -
- -
-
- -

- Passport Information 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, transportation, and activities. If the information you - provide is incorrect, you would not be able to board your flight or trains, and therefore - reissuing of tickets would be at your expense!

- -
-

Traveler 1

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

Date of birth

- - - -
-
-

Date of expiration

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

Your contact information (optional)

-

Having a phone number, especially with WhatsApp/iMessage capability will help us contact you in - case of emergency.

- -

Phone No.

-
- - -
-
-

Home address

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

Your Flight Information (optional)

-

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. - Please ensure the details you provide are correct. You can skip this if your don't need airport - transfer service.

- -
- -
- - -
-
-
-

Arrival date

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

Departure date

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

Your Special Request (optional)

-

- -
- -
-

Emergency Contact Information (optional)

-
(in case an unlikely event happens when you are travelling)
-
-
- - -
-
-
-
- - -
-
-
-

Relationship with him/her

-
- - -
-
-
-

Telephone No.

-
- - -
-
-
- -
-

Your Insurance Information (Optional)

- -
- -
- - - - - - - - - - -
-
-
-
- - - - - - - + + + + + + + Passport Information for All the Group Members + + + + + + + + + + +
+ +

Dear ,

+ +

Thanks for booking with us. China Highlights, Asia Highlights, and Global Highlights are + working together to provide you an exclusive, exciting, and worry-free tour experience in different + destinations.

+ +

Please complete and submit the information below.

+ +
+ +
+
+ +

+ Passport Information 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, transportation, and activities. If the information you + provide is incorrect, you would not be able to board your flight or trains, and therefore + reissuing of tickets would be at your expense!

+ +
+

Primary contact

+
+ +
+ + +
+
+
+ +
+ + +
+
+ + +
+ + +
+ + + +
+ + +
+
+

Date of birth

+ + + +
+
+

Date of expiration

+ + + +
+ + + + + +
+
+ + +
+

Your Flight Information (optional)

+

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. + Please ensure the details you provide are correct. You can skip this if your don't need airport + transfer service.

+ +
+ +
+ + +
+
+
+

Arrival date

+
+ +
+
+
+
+ + +
+
+
+
+ + +
+
+
+

Departure date

+
+ +
+
+
+
+ + +
+
+
+ +
+

Your Special Request (optional)

+

+ +
+ +
+

Emergency Contact Information (optional)

+
(in case an unlikely event happens when you are travelling)
+
+
+ + +
+
+
+
+ + +
+
+
+

Relationship with him/her

+
+ + +
+
+
+

Telephone No.

+
+ + +
+
+
+ +
+

Your Insurance Information (Optional)

+ +
+ +
+ + + + + + + + + + +
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/application/third_party/order/views/gh/confirm_order.php b/application/third_party/order/views/gh/confirm_order.php index c67f8f01..bd45dc23 100644 --- a/application/third_party/order/views/gh/confirm_order.php +++ b/application/third_party/order/views/gh/confirm_order.php @@ -1,957 +1,929 @@ - - - - - - - Passport Information for All the Group Members - - - - - - - - - - -
- -

Dear ,

- -

Thanks for booking with us. China Highlights, Asia Highlights, and Global Highlights are - working together to provide you an exclusive, exciting, and worry-free tour experience in different - destinations.

- -

Please complete and submit the information below.

- -
- -
-
- -

- Passport Information 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, transportation, and activities. If the information you - provide is incorrect, you would not be able to board your flight or trains, and therefore - reissuing of tickets would be at your expense!

- -
-

Traveler 1

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

Date of birth

- - - -
-
-

Date of expiration

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

Your contact information (optional)

-

Having a phone number, especially with WhatsApp/iMessage capability will help us contact you in - case of emergency.

- -

Phone No.

-
- - -
-
-

Home address

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

Your Flight Information (optional)

-

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. - Please ensure the details you provide are correct. You can skip this if your don't need airport - transfer service.

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

Your Special Request (optional)

-

- -
- -
-

Emergency Contact Information (optional)

-
(in case an unlikely event happens when you are travelling)
-
-
- - -
-
-
-
- - -
-
-
-

Relationship with him/her

-
- - -
-
-
-

Telephone No.

-
- - -
-
-
- -
-

Your Insurance Information (Optional)

- -
- -
- - - - - - - - - - -
-
-
-
- - - - - - - + + + + + + + Passport Information for All the Group Members + + + + + + + + + + +
+ +

Dear ,

+ +

Thanks for booking with us. China Highlights, Asia Highlights, and Global Highlights are + working together to provide you an exclusive, exciting, and worry-free tour experience in different + destinations.

+ +

Please complete and submit the information below.

+ +
+ +
+
+ +

+ Passport Information 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, transportation, and activities. If the information you + provide is incorrect, you would not be able to board your flight or trains, and therefore + reissuing of tickets would be at your expense!

+ +
+

Primary contact

+
+ + +
+ + +
+
+
+ +
+ + +
+
+ + +
+ + +
+ + + +
+ + +
+
+

Date of birth

+ + + +
+
+

Date of expiration

+ + + +
+ + + + + +
+
+ + +
+

Your Flight Information (optional)

+

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. + Please ensure the details you provide are correct. You can skip this if your don't need airport + transfer service.

+ +
+ +
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+

Your Special Request (optional)

+

+ +
+ +
+

Emergency Contact Information (optional)

+
(in case an unlikely event happens when you are travelling)
+
+
+ + +
+
+
+
+ + +
+
+
+

Relationship with him/her

+
+ + +
+
+
+

Telephone No.

+
+ + +
+
+
+ +
+

Your Insurance Information (Optional)

+ +
+ +
+ + + + + + + + + + +
+
+
+
+ + + + + + + \ No newline at end of file From 9dfbb11f8d79328f50107fe0f5986493da13ff03 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 22 Dec 2023 14:42:15 +0800 Subject: [PATCH 3/3] fix --- application/controllers/information.php | 119 ++++++++++++------------ 1 file changed, 61 insertions(+), 58 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 32964819..98c71e11 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -136,66 +136,69 @@ class Information extends CI_Controller $node_map = array(); // 循环复制各个层级的节点。 foreach ($src_path as $n => $item) { - if ($item->is_parent_id == $src->is_id) { - // info_content - $item_info_content = $this->InfoContents_model->get_ic_contents2($item->is_ic_id); - $this->InfoContents_model->Add_with_sitecode( - $item_info_content->ic_url, - $item_info_content->ic_url_title, - $item_info_content->ic_type, - $item_info_content->ic_title, - $item_info_content->ic_content, - $item_info_content->ic_summary, - $item_info_content->ic_seo_title, - $item_info_content->ic_seo_description, - $item_info_content->ic_seo_keywords, - $item_info_content->ic_show_bread_crumbs, - $item_info_content->ic_status, - $item_info_content->ic_template, - $item_info_content->ic_photo, - $item_info_content->ic_photo_width, - $item_info_content->ic_photo_height, - $item_info_content->ic_recommend_tours, - $item_info_content->ic_recommend_packages, - $item_info_content->ic_ht_area_id, - $item_info_content->ic_ht_area_type, - $item_info_content->ic_ht_product_id, - $item_info_content->ic_ht_product_type, - $item_info_content->ic_author, - $dest->is_sitecode - ); - - // info_meta - $item_meta_amp = $this->InfoMetas_model->get($item->is_ic_id, 'AMP'); - $item_meta_ampjson = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_JSON'); - $item_meta_ampstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_STATUS'); - $item_meta_pcstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC_STATUS'); - $item_meta_pcbody = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC'); - $item_meta_pccss = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_CSS_PC'); - $item_meta_pcschema = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_SCHEMA'); - - if (!empty($item_meta_amp)) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); - if (!empty($item_meta_ampjson)) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_JSON', $item_meta_ampjson); - if (!empty($item_meta_ampstatus)) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_STATUS', $item_meta_ampstatus); - if (!empty($item_meta_pcstatus)) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC_STATUS', $item_meta_pcstatus); - if (!empty($item_meta_pcbody)) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC', $item_meta_pcbody); - if (!empty($item_meta_pccss)) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_CSS_PC', $item_meta_pccss); - if (!empty($item_meta_pcschema)) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCHEMA', $item_meta_pcschema); - - // 添加节点 - $this->InfoStructures_model->Add_with_sitecode($dest->is_id, $this->InfoContents_model->insert_id, 999, $dest->is_sitecode); - $node_map[$item->is_id] = $this->InfoStructures_model->insert_id; - - } else { + // 定位复制的父节点 + $target_is_id = $dest->is_id; + foreach ($node_map as $old => $new) { + if ($item->is_parent_id == $old) { + $target_is_id = $new; + } } + // info_content + $item_info_content = $this->InfoContents_model->get_ic_contents2($item->is_ic_id); + $this->InfoContents_model->Add_with_sitecode( + $item_info_content->ic_url, + $item_info_content->ic_url_title, + $item_info_content->ic_type, + $item_info_content->ic_title, + $item_info_content->ic_content, + $item_info_content->ic_summary, + $item_info_content->ic_seo_title, + $item_info_content->ic_seo_description, + $item_info_content->ic_seo_keywords, + $item_info_content->ic_show_bread_crumbs, + $item_info_content->ic_status, + $item_info_content->ic_template, + $item_info_content->ic_photo, + $item_info_content->ic_photo_width, + $item_info_content->ic_photo_height, + $item_info_content->ic_recommend_tours, + $item_info_content->ic_recommend_packages, + $item_info_content->ic_ht_area_id, + $item_info_content->ic_ht_area_type, + $item_info_content->ic_ht_product_id, + $item_info_content->ic_ht_product_type, + $item_info_content->ic_author, + $dest->is_sitecode + ); + + // info_meta + $item_meta_amp = $this->InfoMetas_model->get($item->is_ic_id, 'AMP'); + $item_meta_ampjson = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_JSON'); + $item_meta_ampstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_STATUS'); + $item_meta_pcstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC_STATUS'); + $item_meta_pcbody = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC'); + $item_meta_pccss = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_CSS_PC'); + $item_meta_pcschema = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_SCHEMA'); + + if (!empty($item_meta_amp)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); + if (!empty($item_meta_ampjson)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_JSON', $item_meta_ampjson); + if (!empty($item_meta_ampstatus)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_STATUS', $item_meta_ampstatus); + if (!empty($item_meta_pcstatus)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC_STATUS', $item_meta_pcstatus); + if (!empty($item_meta_pcbody)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC', $item_meta_pcbody); + if (!empty($item_meta_pccss)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_CSS_PC', $item_meta_pccss); + if (!empty($item_meta_pcschema)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCHEMA', $item_meta_pcschema); + + // 添加节点 + $this->InfoStructures_model->Add_with_sitecode($target_is_id, $this->InfoContents_model->insert_id, 999, $dest->is_sitecode); + $node_map[$item->is_id] = $this->InfoStructures_model->insert_id; }