From 66209db64f5dae6095b44e313c31c38feb16ca28 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 30 Mar 2020 11:12:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/forms.php | 6 ++++++ application/controllers/orders.php | 7 ++++++- application/helpers/cht_helper.php | 2 -- application/libraries/Tags_analysis.php | 5 +++++ application/views/ah/amp/ampcommonfooter.php | 2 +- application/views/ah/forms/tm_bottom_button.php | 3 +++ application/views/footer.php | 2 +- application/views/orders/lantern_form.php | 1 + application/views/orders/lantern_mobile.php | 1 + application/views/orders/tailormade.php | 1 + application/views/orders/tailormademobile.php | 1 + aspbackup/templates/vietnam-tour.asp | 17 ++++++++--------- 12 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 application/views/ah/forms/tm_bottom_button.php diff --git a/application/controllers/forms.php b/application/controllers/forms.php index c1e309cb..8194a48a 100644 --- a/application/controllers/forms.php +++ b/application/controllers/forms.php @@ -20,6 +20,12 @@ class forms extends CI_Controller { $data['travelNumber'] = $this->input->get_post('travelNumber'); $data['totalprice'] = $this->input->get_post('totalprice'); + if(isset($_SERVER['HTTP_REFERER'])){ + $data['orderfrom'] = $_SERVER['HTTP_REFERER']; + }else{ + $data['orderfrom'] = ''; + } + $this->load->view('header'); $this->load->view('orders/lantern_form',$data); $this->load->view('footer'); diff --git a/application/controllers/orders.php b/application/controllers/orders.php index 42fdc83a..9ba6d4b9 100644 --- a/application/controllers/orders.php +++ b/application/controllers/orders.php @@ -194,7 +194,12 @@ class Orders extends CI_Controller { $this->Orders_model->COLI_ProductSN = $this->input->post('cli_sn'); - $this->Orders_model->COLI_OrderStartDate = $this->input->post('Date_Start'); + if(!empty($this->input->post('Date_Start'))){ + $this->Orders_model->COLI_OrderStartDate = $this->input->post('Date_Start'); + }else{ + $this->Orders_model->COLI_OrderStartDate = $this->input->post('Date_Start_Mobile'); + } + $this->Orders_model->MEI_Gender = $this->input->post('gender'); $this->Orders_model->MEI_Phone = $this->input->post('PhoneNo'); diff --git a/application/helpers/cht_helper.php b/application/helpers/cht_helper.php index 1af1dfa6..3eb9b7c6 100644 --- a/application/helpers/cht_helper.php +++ b/application/helpers/cht_helper.php @@ -119,8 +119,6 @@ function ReplaceFieldName($fields) { case 'url': $OrderDetailText .= '来源页面' . ':' . $value . "\n"; break; - case 'Date_Start_Mobile': - break; case 'TicketType': $OrderDetailText .= 'Which Location' . ':' . $value . "\n"; break; diff --git a/application/libraries/Tags_analysis.php b/application/libraries/Tags_analysis.php index 237a2518..239b764a 100644 --- a/application/libraries/Tags_analysis.php +++ b/application/libraries/Tags_analysis.php @@ -94,6 +94,11 @@ class Tags_analysis { default:; } + if (strpos($data['detail']->ic_content, '@TMBOTTOMBUTTON@') !== false) { + $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/tm_buttom_button', $data, true); + $data['detail']->ic_content = str_replace('@TMBOTTOMBUTTON@', $pd_booking_from, $data['detail']->ic_content); + } + if (strpos($data['detail']->ic_content, '@QUICKBOOKINGFORM@') !== false) { $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/quick_inquiry_form', $data, true); $data['detail']->ic_content = str_replace('@QUICKBOOKINGFORM@', $pd_booking_from, $data['detail']->ic_content); diff --git a/application/views/ah/amp/ampcommonfooter.php b/application/views/ah/amp/ampcommonfooter.php index 7d44612e..74cae28d 100644 --- a/application/views/ah/amp/ampcommonfooter.php +++ b/application/views/ah/amp/ampcommonfooter.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/application/views/ah/forms/tm_bottom_button.php b/application/views/ah/forms/tm_bottom_button.php new file mode 100644 index 00000000..89c4fca5 --- /dev/null +++ b/application/views/ah/forms/tm_bottom_button.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/application/views/footer.php b/application/views/footer.php index ff46c789..c879115c 100644 --- a/application/views/footer.php +++ b/application/views/footer.php @@ -72,7 +72,7 @@
- Copyright © 2019 Asia Highlights. + Copyright © Asia Highlights.
diff --git a/application/views/orders/lantern_form.php b/application/views/orders/lantern_form.php index c87b149f..85166779 100644 --- a/application/views/orders/lantern_form.php +++ b/application/views/orders/lantern_form.php @@ -161,6 +161,7 @@ + diff --git a/application/views/orders/lantern_mobile.php b/application/views/orders/lantern_mobile.php index c06a3162..254e82be 100644 --- a/application/views/orders/lantern_mobile.php +++ b/application/views/orders/lantern_mobile.php @@ -154,6 +154,7 @@ +

diff --git a/application/views/orders/tailormade.php b/application/views/orders/tailormade.php index 4ad7d990..d6d35326 100644 --- a/application/views/orders/tailormade.php +++ b/application/views/orders/tailormade.php @@ -427,6 +427,7 @@

+
diff --git a/application/views/orders/tailormademobile.php b/application/views/orders/tailormademobile.php index 0428e40a..0dff249b 100644 --- a/application/views/orders/tailormademobile.php +++ b/application/views/orders/tailormademobile.php @@ -283,6 +283,7 @@
+
diff --git a/aspbackup/templates/vietnam-tour.asp b/aspbackup/templates/vietnam-tour.asp index 2f56db22..0bde5ff2 100644 --- a/aspbackup/templates/vietnam-tour.asp +++ b/aspbackup/templates/vietnam-tour.asp @@ -1750,15 +1750,14 @@
-
HomeTop ToursVietnam Tours
-
-

Vietnam is a “safe, good-value option” whenever considering a trip to Asia! It encompasses - everything — from nature, rich history, culture and to its food. Without spending too much - money, you will be paid back with guaranteed good experiences and go home with interesting - stories to tell.

-

Top 3 Private Vietnam Tour Packages

-

The itineraries below are for your inspiration providing you the possibilities of a Vietnam trip. - These can be tailor-made for your visit to Vietnam and its neighboring countries.

+
HomeTop ToursIndia Tours
+ +
+

India is a large country that is packed full of incredible things to see and do from ancient palaces and temples to colonial streets and busy markets. It is also full of unique wildlife and natural scenery, such as the jungles of Central India, the deserts of Western India, the backwaters and the beaches of South India, and the striking Himalayas in the north. No matter who you travel with and which parts you would like to visit, we are happy to customize a private trip to India and also any extensions to other South Asian countries.

+ +

Best India Tour Packages

+ +

The following India tour packages have been designed to cover most highlights of India's unique culture, which are good choices for your first India tour. For first-time visitors, we recommend exploring the Golden Triangle cities of Delhi, Agra, and Jaipur. Visitors who have a few extra days can also add trips to Ranthambore National Park and Varanasi. Sign up for your favorite tours or simply treat these as inspiration, allowing each trip to be crafted especially for you.