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.
-
-
-
-
-
-
-
-
-
-
-
\ 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
+
+
+ Mr.
+ Ms.
+
+
+
+
+ Sur name
+
+
+
+
+
+
+
+
+ Given name
+
+
+
+
Please enter your name.
+
+
+
+
+ Passport No.
+
+
+
Please enter your passport number.
+
+
+ Select your nationality
+ Australia
+ Canada
+ China
+ France
+ Germany
+ Italy
+ Malaysia
+ Singapore
+ United Kingdom
+ United States
+ Afghanistan
+ Albania
+ Algeria
+ American Samoa
+ Andorra
+ Angola
+ Anguilla
+ Antarctica
+ Antigua And Barbuda
+ Argentina
+ Armenia
+ Aruba
+ Austria
+ Azerbaijan
+ Bahamas
+ Bahrain
+ Bangladesh
+ Barbadian
+ Barbados
+ Belarus
+ Belgium
+ Belize
+ Benin
+ Bermuda
+ Bhutan
+ Bolivia
+ Botswana
+ Bouvet Island
+ Brazil
+ British Indian Ocean Territory
+ Brunei Darussalam
+ Bulgaria
+ Burkina Faso
+ Burundi
+ Cambodia
+ Cameroon
+ Cape Verde
+ Cayman Islands
+ Central African Republic
+ Chad
+ Chile
+ China HK
+ Christmas Island
+ Colombia
+ Comoros
+ Congo
+ Cook Islands
+ Costa Rica
+ Croatia
+ Cuba
+ Cyprus
+ Czech Republic
+ Czechoslovakia
+ Denmark
+ Djibouti
+ Dominica
+ Dominican Republic
+ East Timor
+ Ecuador
+ Egypt
+ El Salvador
+ Equatorial Guinea
+ Eritrea
+ Estonia
+ Ethiopia
+ Falkland Islands
+ Faroe Islands
+ Fiji
+ Finland
+ French Guiana
+ French Polynesia
+ Gabon
+ Gambia
+ Georgia
+ Ghana
+ Gibraltar
+ Greece
+ Greenland
+ Grenada
+ Guadeloupe
+ Guam
+ Guatemala
+ Guernsey
+ Guinea
+ Guinea-Bissau
+ Guyana
+ Haiti
+ Honduras
+ Hong Kong
+ Hungary
+ Iceland
+ India
+ Indonesia
+ Iran
+ Iraq
+ Ireland
+ Isle Of Man
+ Israel
+ Jamaica
+ Japan
+ Jersey
+ Jordan
+ Kazakhstan
+ Kazakhstan2
+ Kenya
+ Kiribati
+ Korea
+ Kuwait
+ Kyrgyzstan
+ Laos
+ Latvia
+ Lebanon
+ Lesotho
+ Liberia
+ Libyan Arab Jamahiriya
+ Liechtenstein
+ Lithuania
+ Luxembourg
+ Macau
+ Macedonia
+ Madagascar
+ Malawi
+ Maldives
+ Mali
+ Malta
+ Marshall Islands
+ Martinique
+ Mauritania
+ Mauritius
+ Mayotte
+ Mexican
+ Micronesia
+ Moldova
+ Monaco
+ Mongolia
+ Montserrat
+ Morocco
+ Mozambique
+ Myanmar
+ Namibia
+ Nauru
+ Nepal
+ Netherlands
+ Netherlands Antilles
+ Neutral Zone
+ New Caledonia
+ New Zealand
+ Nicaragua
+ Niger
+ Nigeria
+ Niue
+ Norfolk Island
+ North Korea
+ Northern Mariana Islands
+ Norway
+ Oman
+ Pakistan
+ Palau
+ Panama
+ Papua New Guinea
+ Paraguay
+ Peru
+ Philippines
+ Pitcairn
+ Poland
+ Portugal
+ Puerto Rico
+ Qatar
+ Reunion
+ Romania
+ Russian Federation
+ Rwanda
+ Saint Helena
+ Samoa
+ San Marino
+ Sao Tome and Principe
+ Saudi Arabia
+ Scotland
+ Senegal
+ Seychelles
+ Sierra Leone
+ Slovakia
+ Slovenia
+ Solomon Islands
+ Somalia
+ South Africa
+ South Georgia and The Sandwich
+ Spain
+ Sri Lanka
+ Sudan
+ Suriname
+ Swaziland
+ Sweden
+ Switzerland
+ Syrian Arab Republic
+ Taiwan
+ Tanzania
+ Thailand
+ The Republic of Cote d'ivoire
+ Togo
+ Tokelau
+ Tonga
+ Trinidad and Tobago
+ Tunisia
+ Turkey
+ Turkmenistan
+ Turks and Caicos Islands
+ Tuvalu
+ Uganda
+ Ukraine
+ United Arab Emirates
+ unknown
+ Uruguay
+ USSR
+ Uzbekistan
+ Vanuatu
+ Vatican City State
+ Venezuela
+ Vietnam
+ Virgin Islands (British)
+ Virgin Islands (U.S.)
+ Western Sahara
+ Yemen
+ Yugoslavia
+ Zaire
+ Zambia
+ Zimbabwe
+
+
+
+
+ Phone number
+
+
+
+
+
Date of expiration
+
+
+
+
+
Please select your date of birth.
+
Please select your date of passport expiration.
+
+
+ Occupation (optional)
+ Professional
+ Professor or similar
+ Retired person
+ Business owner
+ Government official
+ Housewife
+ Self-emloyed person
+ Others
+
+
+ Add a traveler
+
+
+
+
+
+
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 flight No.
+
+
+
+
+
+
+
+
+
+ Departure Flight No.
+
+
+
+
+
+
+
+
+
+
+
Emergency Contact Information
+
(in case an unlikely event happens when you are travelling)
+
+
+
+
+ Contact person's name
+
+
+
+
+
+
+
+ Email address
+
+
+
+
+
Relationship with him/her
+
+
+
+ eg: He's Sue's father.
+
+
+
+
+
Telephone No.
+
+
+
+ including country code and area code
+
+
+
+
+
+
Your Insurance Information and Special Request (optional)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Check & Submit
+
+
+
+
+
+
+
+
+
+
+
+
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;
Select your nationality
- United States
- United Kingdom
- Australia
- Canada
- France
- Germany
- Italy
- Mexico
- Netherlands
- Singapore
- Afghanistan
- Albania
- Algeria
- American Samoa
- Andorra
- Angola
- Anguilla
- Australia
- Antigua and Barbuda
- Argentina
- Armenia
- Aruba297
- Ascension Island2
- Austria
- Azerbaijan
- Bahamas
- Bahrain
- Bangladesh
- Barbados
- Belarus
- Belgium
- Belize
- Benin
- Bermuda
- Bhutan
- Bolivia
- Bosnia and Herzegovina
- Botswana
- Brazil
- British Indian Ocean Territory
- British Virgin Islands
- Brunei
- Bulgaria
- Burkina Faso
- Burundi
- Cambodia
- Cameroon
- Canada
- Cape Verde
- Caribbean Netherlands
- Cayman Islands
- Central African Republic
-
- Chad
- Chile
- China
- Christmas Island
- Cocos Islands
- Colombia
- Comoros
- Congo (DRC)
- Congo (Republic)
- Cook Islands
- Costa Rica
- Côte d'Ivoire
- Croatia
- Cuba
- Curaçao
- Cyprus
- Czech Republic
- Denmark
- Djibouti
- Dominica
- Dominican Republic
- Ecuador
- Egypt
- El Salvador
- Equatorial Guinea
- Eritrea
- Estonia
- Eswatini
- Ethiopia
- Falkland Islands
- Faroe Islands
- Fiji
- Finland
- France
- French Guiana
- French Polynesia6
- Gabon
- Gambia
- Georgia
- Germany
- Ghana
- Gibraltar
- Greece
- Greenland
- Grenada
- Guadeloupe
- Guam
- Guatemala
- Guernsey
- Guinea
- Guinea-Bissau
- Guyana
- Haiti
- Honduras
- Hong Kong
- Hungary
- Iceland
- India
- Indonesia
- Iran
- Iraq
- Ireland
- Isle of Man
- Israel
- Italy
- Jamaica
- Japan
- Jersey
- Jordan
- Kazakhstan
- Kenya
- Kiribati
- Kosovo
- Kuwait
- Kyrgyzstan
- Laos
- Latvia
- Lebanon
- Lesotho
- Liberia
- Libya
- Liechtenstein
- Lithuania
- Luxembourg
- Macau
- Macedonia
- Madagascar
- Malawi
- Malaysia
- Maldives
- Mali
- Malta
- Marshall Islands
- Martinique
- Mauritania
- Mauritius
- Mayotte
- Micronesia
- Moldova
- Monaco
- Mongolia
- Montenegro
- Montserrat
- Morocco
- Mozambique
- Myanmar
- Namibia
- Nauru
- Nepal
- New Caledonia
- New Zealand
- Nicaragua
- Niger
- Nigeria
- Niue683
- Norfolk Island
- North Korea
- Northern Mariana Islands
- Norway
- Oman
- Pakistan
- Palau
- Palestine
- Panama 507
- Papua New Guinea
- Paraguay
- Peru
- Philippines
- Poland
- Portuga
- Puerto Rico
- Qatar
- Réunion
- Romania
- Russia
- Rwanda
- Saint Barthélemy
- Saint Helena
- Saint Kitts and Nevis
- Saint Lucia
- Saint Martin
- Saint Pierre and Miquelon
-
- Saint Vincent and the Grenadines
- Samoa
- San Marino
- São Tomé and Príncipe
- Saudi Arabia
- Senegal
- Serbia
- Seychelles
- Sierra Leone
- Sint Maarten
- Slovakia
- Slovenia
- Solomon Islands
- Somalia
- South Africa
- South Korea
- South Sudan
- Spain
- Sri Lanka
- Sudan
- Suriname
- Svalbard and Jan Mayen
- Sweden
- Switzerland
- Syria
- Taiwan
- Tajikistan
- Tanzania
- Thailand
- Timor-Leste
- Togo
- Tokelau
- Tonga
- Trinidad and Tobago
- Tunisia
- Turkey
- Turkmenistan
- Turks and Caicos Islands
- Tuvalu
- U.S. Virgin Islands
- Uganda
- Ukraine
- United Arab Emirates
- United Kingdom
- United States
- Uruguay
- Uzbekistan
- Vanuatu
- Vatican City
- Venezuela
- Vietnam
- Wallis and Futuna
- Western Sahara
- Yemen
- Zambia
- Zimbabwe
- Åland Islands
+ Australia
+ Canada
+ China
+ France
+ Germany
+ Italy
+ Malaysia
+ Singapore
+ United Kingdom
+ United States
+ Afghanistan
+ Albania
+ Algeria
+ American Samoa
+ Andorra
+ Angola
+ Anguilla
+ Antarctica
+ Antigua And Barbuda
+ Argentina
+ Armenia
+ Aruba
+ Austria
+ Azerbaijan
+ Bahamas
+ Bahrain
+ Bangladesh
+ Barbadian
+ Barbados
+ Belarus
+ Belgium
+ Belize
+ Benin
+ Bermuda
+ Bhutan
+ Bolivia
+ Botswana
+ Bouvet Island
+ Brazil
+ British Indian Ocean Territory
+ Brunei Darussalam
+ Bulgaria
+ Burkina Faso
+ Burundi
+ Cambodia
+ Cameroon
+ Cape Verde
+ Cayman Islands
+ Central African Republic
+ Chad
+ Chile
+ China HK
+ Christmas Island
+ Colombia
+ Comoros
+ Congo
+ Cook Islands
+ Costa Rica
+ Croatia
+ Cuba
+ Cyprus
+ Czech Republic
+ Czechoslovakia
+ Denmark
+ Djibouti
+ Dominica
+ Dominican Republic
+ East Timor
+ Ecuador
+ Egypt
+ El Salvador
+ Equatorial Guinea
+ Eritrea
+ Estonia
+ Ethiopia
+ Falkland Islands
+ Faroe Islands
+ Fiji
+ Finland
+ French Guiana
+ French Polynesia
+ Gabon
+ Gambia
+ Georgia
+ Ghana
+ Gibraltar
+ Greece
+ Greenland
+ Grenada
+ Guadeloupe
+ Guam
+ Guatemala
+ Guernsey
+ Guinea
+ Guinea-Bissau
+ Guyana
+ Haiti
+ Honduras
+ Hong Kong
+ Hungary
+ Iceland
+ India
+ Indonesia
+ Iran
+ Iraq
+ Ireland
+ Isle Of Man
+ Israel
+ Jamaica
+ Japan
+ Jersey
+ Jordan
+ Kazakhstan
+ Kazakhstan2
+ Kenya
+ Kiribati
+ Korea
+ Kuwait
+ Kyrgyzstan
+ Laos
+ Latvia
+ Lebanon
+ Lesotho
+ Liberia
+ Libyan Arab Jamahiriya
+ Liechtenstein
+ Lithuania
+ Luxembourg
+ Macau
+ Macedonia
+ Madagascar
+ Malawi
+ Maldives
+ Mali
+ Malta
+ Marshall Islands
+ Martinique
+ Mauritania
+ Mauritius
+ Mayotte
+ Mexican
+ Micronesia
+ Moldova
+ Monaco
+ Mongolia
+ Montserrat
+ Morocco
+ Mozambique
+ Myanmar
+ Namibia
+ Nauru
+ Nepal
+ Netherlands
+ Netherlands Antilles
+ Neutral Zone
+ New Caledonia
+ New Zealand
+ Nicaragua
+ Niger
+ Nigeria
+ Niue
+ Norfolk Island
+ North Korea
+ Northern Mariana Islands
+ Norway
+ Oman
+ Pakistan
+ Palau
+ Panama
+ Papua New Guinea
+ Paraguay
+ Peru
+ Philippines
+ Pitcairn
+ Poland
+ Portugal
+ Puerto Rico
+ Qatar
+ Reunion
+ Romania
+ Russian Federation
+ Rwanda
+ Saint Helena
+ Samoa
+ San Marino
+ Sao Tome and Principe
+ Saudi Arabia
+ Scotland
+ Senegal
+ Seychelles
+ Sierra Leone
+ Slovakia
+ Slovenia
+ Solomon Islands
+ Somalia
+ South Africa
+ South Georgia and The Sandwich
+ Spain
+ Sri Lanka
+ Sudan
+ Suriname
+ Swaziland
+ Sweden
+ Switzerland
+ Syrian Arab Republic
+ Taiwan
+ Tanzania
+ Thailand
+ The Republic of Cote d'ivoire
+ Togo
+ Tokelau
+ Tonga
+ Trinidad and Tobago
+ Tunisia
+ Turkey
+ Turkmenistan
+ Turks and Caicos Islands
+ Tuvalu
+ Uganda
+ Ukraine
+ United Arab Emirates
+ unknown
+ Uruguay
+ USSR
+ Uzbekistan
+ Vanuatu
+ Vatican City State
+ Venezuela
+ Vietnam
+ Virgin Islands (British)
+ Virgin Islands (U.S.)
+ Western Sahara
+ Yemen
+ Yugoslavia
+ Zaire
+ Zambia
+ Zimbabwe