diff --git a/application/controllers/information.php b/application/controllers/information.php index 239395f0..95f110e0 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -136,69 +136,57 @@ class Information extends CI_Controller $node_map = array(); // 循环复制各个层级的节点。 foreach ($src_path as $n => $item) { - - // 定位复制的父节点 - $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)) + 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, + $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->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); - 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; + // 添加节点 + $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 { + + } } @@ -231,10 +219,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)) { diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index f4278762..5185dfbd 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/confirm_order.php @@ -1,935 +1,933 @@ - - - - - - - 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 + + + + + + + + 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

+

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

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

Emergency Contact Information

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

Relationship with him/her

+
+ + +
+
+
+

Telephone No.

+
+ + +
+
+
+
+

Your Insurance Information and Special Request (optional)

+ + +
+ + +
+ + + + + + + + + + +
+
+
+
+ + + + + + diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index 2277b14c..956ceeac 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -436,259 +436,243 @@ select.gender_pick {border: 1px solid #d1d1d1;
@@ -730,7 +714,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
-

Your Flight Information (optional)

+

Your Flight Information

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.

@@ -738,7 +722,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -747,13 +731,13 @@ select.gender_pick {border: 1px solid #d1d1d1;

Arrival time

- +
- + @@ -762,7 +746,7 @@ select.gender_pick {border: 1px solid #d1d1d1;

Departure time

- +
diff --git a/application/third_party/order/views/gh/confirm_order.php b/application/third_party/order/views/gh/confirm_order.php index bd45dc23..2eb9c897 100644 --- a/application/third_party/order/views/gh/confirm_order.php +++ b/application/third_party/order/views/gh/confirm_order.php @@ -1,929 +1,927 @@ - - - - - - - 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 + + + + + + + + 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

+

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.

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

Emergency Contact Information

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

Relationship with him/her

+
+ + +
+
+
+

Telephone No.

+
+ + +
+
+
+
+

Your Insurance Information and Special Request (optional)

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