Merge branch 'master' of github.com:hainatravel/asiahighlights.com

# Conflicts:
#	application/views/orders/tailormade-ppc.php
#	application/views/orders/tailormademobile-ppc.php

.htaccess

@@ -1540,6 +1540,7 @@ RewriteRule ^/vietnam/tours/$ https://www.asiahighlights.com/vietnam/tours [R=30
 #orders
 RewriteRule ^/create-my-trip.htm$ /index.php/orders/tailormade/ [U,L] 
 RewriteRule ^/tailor-make-your-trip$ /index.php/forms/tailormade_ppc/ [U,L] 
+RewriteRule ^/tailor-make-your-trip-easy$ /index.php/forms/tailormade_ppc_easy/ [U,L] 
 RewriteRule ^/orders/triprequest.htm$ /index.php/forms/triprequest/ [U,L] 
 RewriteRule ^/forms/(.*)$ /index.php/forms/$1/ [U,L] 
 RewriteRule ^/orders/(.*)$ /index.php/orders/$1/ [U,L]

application/controllers/forms.php

@@ -164,6 +164,16 @@ class forms extends CI_Controller {
 		}
 	}
 	
+	public function tailormade_ppc_easy() {
+		$data = array();
+		$detect = new Mobile_Detect;
+		if ($detect->isMobile() && !$detect->isTablet()) {
+			$this->load->view('orders/tailormademobile-ppc-easy', $data);
+		} else {
+			$this->load->view('orders/tailormade-ppc-easy', $data);
+		}
+	}
+	
 	public function tailormademobile(){
 		$data['countrylist'] = ['Vietnam','Cambodia','India','Thailand','Myanmar','Japan','Laos','Nepal','Sri Lanka','China','Mongolia','Indonesia'];
 		$data['action'] = '/orders/triprequest_save';