diff --git a/404.php b/404.php index 4d3d5f10..3a00a385 100644 --- a/404.php +++ b/404.php @@ -213,7 +213,7 @@ Header("HTTP/1.1 404 Not Found"); About - Create My Trip + Create My Trip diff --git a/application/controllers/ajax.php b/application/controllers/ajax.php index 818ad1d3..63ea49bc 100644 --- a/application/controllers/ajax.php +++ b/application/controllers/ajax.php @@ -6,7 +6,7 @@ class ajax extends CI_Controller { //ajax 获取信息页面底部tailorshort public function footerTailorShort(){ - $html = '
Overwhelmed by thousands of trip ideas and tours?
Contact one of our travel advisors for help! Help Me Plan Now
'; + $html = '
Overwhelmed by thousands of trip ideas and tours?
Contact one of our travel advisors for help! Help Me Plan Now
'; echo $html; } diff --git a/application/controllers/orders.php b/application/controllers/orders.php index 7944f459..0e41b2c9 100644 --- a/application/controllers/orders.php +++ b/application/controllers/orders.php @@ -213,13 +213,12 @@ class Orders extends CI_Controller { if (!empty($third_webcode)) { $this->Orders_model->COLI_WebCode = $third_webcode; } - - //print_r($this->load->view('orders/newemail_template', '', true)); - //die(); + /*print_r($this->load->view('ah/email/tailormade_email', '', true)); + die();*/ $this->Orders_model->TourOrderSave(); $this->Orders_model->SendMail($fullname, $this->input->post('email'), $this->config->item('Site_ServiceName'), $this->config->item('Site_ServiceEmail'),$emailtitle , $this->Orders_model->COLI_OrderDetailText); //发送邮件给客人 (20160504tailor_make) - $this->Orders_model->SendMail($this->config->item('Site_ServiceName'), $this->config->item('Site_ServiceEmail'), $fullname, $this->input->post('email'), $emailtitle, $this->load->view('orders/newemail_template', '', true)); + $this->Orders_model->SendMail($this->config->item('Site_ServiceName'), $this->config->item('Site_ServiceEmail'), $fullname, $this->input->post('email'), $emailtitle, $this->load->view('ah/email/tailormade_email', '', true)); redirect(site_url('orders/tailormade_thankyou')); } @@ -370,8 +369,8 @@ class Orders extends CI_Controller { $this->Orders_model->COLI_OPI_SN = $this->input->post('COLI_OPI_SN'); } - //print_r($this->load->view('orders/newemail_template', '', true)); - //die(); + print_r($this->load->view('orders/newemail_template', '', true)); + die(); $this->Orders_model->TourOrderSave(); $this->Orders_model->SendMail($fullname, $this->input->post('email'), $this->config->item('Site_ServiceName'), $this->config->item('Site_ServiceEmail'),$emailtitle , $this->Orders_model->COLI_OrderDetailText); //发送邮件给客人 (20160504tailor_make) @@ -471,7 +470,7 @@ class Orders extends CI_Controller { //发送邮件给客人 $this->Orders_model->SendMail($this->config->item('Site_ServiceName'), $this->config->item('Site_ServiceEmail'), $this->input->post('realname'), $this->input-> - post('email'), 'Question Orders', $this->load->view('orders/email_template', '', true)); + post('email'), 'Question Orders', $this->load->view('ah/email/email_template', '', true)); //是否AJAX提交？ @@ -719,7 +718,7 @@ class Orders extends CI_Controller { post('email'), $this->config->item('Site_ServiceName'), $this->config->item('Site_ServiceEmail'), 'Contactus Orders', $this->Orders_model->COLI_OrderDetailText); //发送邮件给客人 $this->Orders_model->SendMail($this->config->item('Site_ServiceName'), $this->config->item('Site_ServiceEmail'), $this->input->post('realname'), $this->input-> - post('email'), 'Contactus Orders', $this->load->view('orders/email_template', '', true)); + post('email'), 'Contactus Orders', $this->load->view('ah/email/email_template', '', true)); $data[] = array('name' => 'ok', 'value' => site_url('orders/callus-thankyou/')); echo json_encode($data); } @@ -1011,7 +1010,7 @@ class Orders extends CI_Controller { post('email'), $this->config->item('Site_ServiceName'), $this->config->item('Site_ServiceEmail'), 'Tour Orders', $this->Orders_model->COLI_OrderDetailText); //发送邮件给客人(20160504inquiry_form) $this->Orders_model->SendMail($this->config->item('Site_ServiceName'), $this->config->item('Site_ServiceEmail'), $this->input->post('realname'), $this->input-> - post('email'), 'Tour Orders', $this->load->view('orders/email_template', '', true)); + post('email'), 'Tour Orders', $this->load->view('ah/email/email_template', '', true)); $data[] = array('name' => 'go', 'value' => site_url('orders/asia_tour_thankyou')); echo json_encode($data); diff --git a/application/core/amp-template.html b/application/core/amp-template.html index b6405764..b6f7c1d8 100644 --- a/application/core/amp-template.html +++ b/application/core/amp-template.html @@ -84,7 +84,7 @@ a{background-color:transparent;-webkit-text-decoration-skip:objects;color:#54545 -
  • CUSTOMIZE
    • +
  • CUSTOMIZE
  • About
  • Contact
    • diff --git a/application/libraries/Tags_analysis.php b/application/libraries/Tags_analysis.php index fc50bdd5..0d0a171d 100644 --- a/application/libraries/Tags_analysis.php +++ b/application/libraries/Tags_analysis.php @@ -55,47 +55,11 @@ class Tags_analysis { $data['detail']->ic_content = str_replace('@AMP-NEWBOOKINGFORM@', $pd_booking_from, $data['detail']->ic_content); } - //填充预订表单模板 - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-PAYNOW@') !== false) { - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_paynow', $data, true); - $data['detail']->ic_content = str_replace('@BOOKINGFORM-PAYNOW@', $pd_booking_from, $data['detail']->ic_content); - } - - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-TOUR@') !== false) { - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_tour', $data, true); - $data['detail']->ic_content = str_replace('@BOOKINGFORM-TOUR@', $pd_booking_from, $data['detail']->ic_content); - } - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-INQUIRY@') !== false) { $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_inquiry', $data, true); $data['detail']->ic_content = str_replace('@BOOKINGFORM-INQUIRY@', $pd_booking_from, $data['detail']->ic_content); } - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-INQUIRY-SMALL@') !== false) { - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_inquiry_small', $data, true); - $data['detail']->ic_content = str_replace('@BOOKINGFORM-INQUIRY-SMALL@', $pd_booking_from, $data['detail']->ic_content); - } - - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-BUTTON@') !== false) { - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_button', $data, true); - $data['detail']->ic_content = str_replace('@BOOKINGFORM-BUTTON@', $pd_booking_from, $data['detail']->ic_content); - } - - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-BUTTON-FOOTER@') !== false) { - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_button_footer', $data, true); - $data['detail']->ic_content = str_replace('@BOOKINGFORM-BUTTON-FOOTER@', $pd_booking_from, $data['detail']->ic_content); - } - - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-STYLE@') !== false) { - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_style', $data, true); - $data['detail']->ic_content = str_replace('@BOOKINGFORM-STYLE@', $pd_booking_from, $data['detail']->ic_content); - } - - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-QUOTE@') !== false) { - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_quote', $data, true); - $data['detail']->ic_content = str_replace('@BOOKINGFORM-QUOTE@', $pd_booking_from, $data['detail']->ic_content); - } - if (strpos($data['detail']->ic_content, '@BOOKING-INQUIRY-NOW@') !== false) { $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_inquiry_now', $data, true); $data['detail']->ic_content = str_replace('@BOOKING-INQUIRY-NOW@', $pd_booking_from, $data['detail']->ic_content); @@ -115,18 +79,7 @@ class Tags_analysis { $data['pd_package'] = $this->CI->BIZ_PackageInfo_model->search($meta_product_code, 1); //print_r($data['pd_tour']); if (!empty($data['pd_package'])) { - - //填充预订表单模板 - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-PACKAGE@') !== false) { - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_package', $data, true); - $data['detail']->ic_content = str_replace('@BOOKINGFORM-PACKAGE@', $pd_booking_from, $data['detail']->ic_content); - } - - //填充预订表单模板 - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-PACKAGE-DESTINATION@') !== false) { - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_package_destination', $data, true); - $data['detail']->ic_content = str_replace('@BOOKINGFORM-PACKAGE-DESTINATION@', $pd_booking_from, $data['detail']->ic_content); - } + } } @@ -264,12 +217,6 @@ class Tags_analysis { $data['detail']->ic_content = str_replace('@TAILOR-SHORT@', $pd_booking_from, $data['detail']->ic_content); } - //问题表单 - if (strpos($data['detail']->ic_content, '@BOOKINGFORM-INQUIRY_LIST@') !== false) { - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_inquiry_list', $data, true); - $data['detail']->ic_content = str_replace('@BOOKINGFORM-INQUIRY_LIST@', $pd_booking_from, $data['detail']->ic_content); - } - //天气预报 if (strpos($data['detail']->ic_content, '@WEATHER_INFO@') !== false) { $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/info/weather_info', $data, true); @@ -295,67 +242,12 @@ class Tags_analysis { $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/info/info_left_menu', $list, true); $data['detail']->ic_content = str_replace('@INFO-LEFT-MENU@', $pd_booking_from, $data['detail']->ic_content); } - //新 左侧导航 - if (strpos($data['detail']->ic_content, '@INFO-NEW-LEFT-MENU@') !== false) { - $list_new_left_menu = ""; - - $is_path = explode(",", $data['detail']->is_path); - $list_new_left_menu["is_path"] = $is_path; - $list_new_left_menu["level_1"] = $this->CI->Information_model->get_detail($is_path[1]); - $list_new_left_menu["level_2"] = $this->CI->Information_model->get_same_level($is_path[1],10);//home 的下一级菜单 比如Myanmar - foreach ($list_new_left_menu["level_2"] as $v_level_key => $v_level_2) { - $list_new_left_menu["level_2"][$v_level_key]->level_3=$this->CI->Information_model->get_same_level($v_level_2->is_id,10); - foreach ($list_new_left_menu["level_2"][$v_level_key]->level_3 as $v_level_key_3 => $v_level_3) { - //第3级子级是一个文件夹，点进去的时候对应到相应的链接，或是没有对应的链接，就默认进入第3级子级下的1个页面;如果level_3没有连接，就用level_4第一个 - $list_new_left_menu["level_2"][$v_level_key]->level_3[$v_level_key_3]->level_4=$this->CI->Information_model->get_same_level($v_level_3->is_id,1); - } - } - - // var_dump($list["level_2"]);die; - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/info/info_new_left_menu', $list_new_left_menu, true); - $data['detail']->ic_content = str_replace('@INFO-NEW-LEFT-MENU@', $pd_booking_from, $data['detail']->ic_content); - } - //底部推荐 - if (strpos($data['detail']->ic_content, '@INFO-YOU-MAY-LIKE@') !== false) { - $meta_recommend_info = $this->CI->InfoMetas_model->get($data['detail']->ic_id, 'meta_recommend_info'); - if(empty($meta_recommend_info)){ - $list["data"]=array(); - }else{ - $list["data"]=$this->CI->Information_model->get_some_detail($meta_recommend_info); - } - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/info/info_you_may_like', $list, true); - $data['detail']->ic_content = str_replace('@INFO-YOU-MAY-LIKE@', $pd_booking_from, $data['detail']->ic_content); - } - //作者信息 - if (strpos($data['detail']->ic_content, '@INFO-AUTHOR@') !== false) { - $author = $this->CI->Information_model->get_detail($data['detail']->is_id); - $list = array("OPI2_FirstName"=>trim($author->OPI2_FirstName),"OPI2_LastName"=>trim($author->OPI2_LastName)); - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/info/info_author', $list, true); - $data['detail']->ic_content = str_replace('@INFO-AUTHOR@', $pd_booking_from, $data['detail']->ic_content); - } - //面包屑 home > 父级链接 >本页 - if (strpos($data['detail']->ic_content, '@INFO-CRUMBS@') !== false) { - $list["oneself"]=$this->CI->Information_model->get_detail($data['detail']->is_id); - $path = explode("," , $list["oneself"]->is_path); - foreach ($path as $value) { - if(!empty($value)){ - $parent=$this->CI->Information_model->get_detail($value); - if(!empty($parent->ic_url)){ - $list["parents"][] = array("ic_url"=>$parent->ic_url,"ic_url_title"=>$parent->ic_url_title); - } - } - } - $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/info/info_crumbs', $list, true); - $data['detail']->ic_content = str_replace('@INFO-CRUMBS@', $pd_booking_from, $data['detail']->ic_content); - } //Quick Inquiry contactus 联系我们 if (strpos($data['detail']->ic_content, '@BOOKING-QUICK-INQUIRY@') !== false) { $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_quick_inquiry', $data, true); $data['detail']->ic_content = str_replace('@BOOKING-QUICK-INQUIRY@', $pd_booking_from, $data['detail']->ic_content); } - - //AMP的标签 begin diff --git a/application/views/orders/email_template.php b/application/views/ah/email/email_template.php similarity index 100% rename from application/views/orders/email_template.php rename to application/views/ah/email/email_template.php diff --git a/application/views/ah/email/newemail_template.php b/application/views/ah/email/newemail_template.php new file mode 100644 index 00000000..ea6d8566 --- /dev/null +++ b/application/views/ah/email/newemail_template.php @@ -0,0 +1,46 @@ +'; +echo 'Customers Email Review - China Highlights'; +echo ''; +echo '
    '; +echo '
    '; +echo ''; +echo '

    One of our specialists will go through your travel plan +and contact you within 24 hours.

    '; +echo '

    Here is a general frame of your inquiry. Let us know if +it is incorrect or you need to make any changes.

    '; +echo '

    Thank you once again for choosing Asia Highlights.

    '; +echo '

    Kind Regards,

    '; +echo '
    '; +echo 'www.asiahighlights.com
    '; +echo '
    '; +echo '
    If you have not received a reply within 24 hours, please check your “junk mail” folder. Or email contact@asiahighlights.com and we will investigate the case.
    '; + +?> \ No newline at end of file diff --git a/application/views/ah/info/booking_left_menu.html b/application/views/ah/info/booking_left_menu.html deleted file mode 100644 index 87fa3b2c..00000000 --- a/application/views/ah/info/booking_left_menu.html +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/application/views/ah/info/info_author.php b/application/views/ah/info/info_author.php deleted file mode 100644 index 16b35ead..00000000 --- a/application/views/ah/info/info_author.php +++ /dev/null @@ -1,30 +0,0 @@ - \ No newline at end of file diff --git a/application/views/ah/info/info_crumbs.php b/application/views/ah/info/info_crumbs.php deleted file mode 100644 index 5f1826a1..00000000 --- a/application/views/ah/info/info_crumbs.php +++ /dev/null @@ -1,11 +0,0 @@ -
    - $value) {?> - - ">Home - - - - "> - - -
    \ No newline at end of file diff --git a/application/views/ah/info/info_new_left_menu.php b/application/views/ah/info/info_new_left_menu.php deleted file mode 100644 index 668530b6..00000000 --- a/application/views/ah/info/info_new_left_menu.php +++ /dev/null @@ -1,18 +0,0 @@ - - \ No newline at end of file diff --git a/application/views/ah/info/info_you_may_like.php b/application/views/ah/info/info_you_may_like.php deleted file mode 100644 index 534af8bb..00000000 --- a/application/views/ah/info/info_you_may_like.php +++ /dev/null @@ -1,10 +0,0 @@ - -
    -

    You May Like

    - $value) {?> -
    - ic_photo:"https://data.asiahighlights.com/image/asia-highlights-article.jpg";?>" />ic_url_title;?> -
    - -
    - \ No newline at end of file diff --git a/application/views/header-inquiry.php b/application/views/header-inquiry.php deleted file mode 100644 index 5387df87..00000000 --- a/application/views/header-inquiry.php +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - <?php echo empty($seo_title) ? 'Vietnam Travel Agency, tour with Asia Highlights-Since 1959' : $seo_title; ?> - - - - - - - - - - - - - - - ' : false; ?> - - - - - - - - - \ No newline at end of file diff --git a/application/views/header-test.php b/application/views/header-test.php deleted file mode 100644 index e51eb28a..00000000 --- a/application/views/header-test.php +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - <?php echo empty($seo_title) ? 'Vietnam Travel Agency, tour with Asia Highlights-Since 1959' : $seo_title; ?> - - - - - - - - - - - - - - - ' : false; ?> - - - - - - - - - \ No newline at end of file diff --git a/application/views/header.php b/application/views/header.php index e92c7547..2aff0a6a 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -247,7 +247,6 @@ -
  • '; diff --git a/application/views/orders/tailormade.php b/application/views/orders/tailormade.php index 8b595ab9..dc1ad0e9 100644 --- a/application/views/orders/tailormade.php +++ b/application/views/orders/tailormade.php @@ -1,4 +1,4 @@ - +
    diff --git a/application/views/orders/tailormademobile.php b/application/views/orders/tailormademobile.php index 469fe39c..f842b54d 100644 --- a/application/views/orders/tailormademobile.php +++ b/application/views/orders/tailormademobile.php @@ -1,4 +1,4 @@ - +
    india kids @@ -118,7 +118,6 @@

    Tell us more to help us put together your ideal journey.

    -
    - - +

    Tell us about you...

    -
    -
    diff --git a/application/views/orders/test.php b/application/views/orders/test.php deleted file mode 100644 index 81e4c6a4..00000000 --- a/application/views/orders/test.php +++ /dev/null @@ -1,5 +0,0 @@ -
    - - - -