Merge branch 'master' into 'live_production'

application/models/Webservice_model.php

@@ -198,7 +198,14 @@ class Webservice_model extends CI_Model {
 		try {
 			$user_id = $this->auth_token_get($data['auth_token']);
 			if($user_id > 0) { 
-				$settingsDetails = $this->db->query("SELECT faq_en AS faq,contact_number FROM privacy_policy")->row_array();
+				
+				$lang = $this->getUserLang($user_id);
+				$field = 'faq_en';
+				if($lang == 'ar'){
+					$field = 'faq_ar';
+				}
+
+				$settingsDetails = $this->db->query("SELECT $field AS faq,contact_number FROM privacy_policy")->row_array();
 				$userDetails = $this->db->query("SELECT customer.name AS name, customer.profile_image AS profile_photo,customer.gender AS gender, customer.email, customer.dob, customer.profile_city AS city_name, users.notification_status, users.email_status FROM customer INNER JOIN users ON users.id = customer.customer_id WHERE customer.customer_id = ".$user_id." AND users.status = 1 ")->row_array();
 				if(count($settingsDetails)>0 && count($userDetails)){
 					$resultData = array();					
@@ -1223,13 +1230,26 @@ class Webservice_model extends CI_Model {
 		try {
 			$user_id = $this->auth_token_get($data['auth_token']);
 			if($user_id > 0) { 
-				$settingsDetails = $this->db->query("SELECT privacy_policy_en,terms_and_conditions_en,contact_number FROM privacy_policy")->row_array();
-				$notificationDetails = $this->db->query("SELECT notification_status, email_status FROM users WHERE id = ".$user_id."")->row_array();
+
+				$lang = $this->getUserLang($user_id);
+				$fields = 'privacy_policy_en AS privacy_policy,
+						   terms_and_conditions_en AS terms_and_conditions,';
+				if($lang == 'ar'){
+					$fields = 'privacy_policy_ar AS privacy_policy,
+							   terms_and_conditions_ar AS terms_and_conditions,';
+				}
+
+				$settingsDetails = $this->db->query("SELECT $fields contact_number FROM privacy_policy")
+											->row_array();
+
+				$notificationDetails = $this->db->query("SELECT notification_status, email_status 
+														 FROM users WHERE id = ".$user_id."")
+												->row_array();
 				if(count($settingsDetails)>0 && count($notificationDetails)>0){
 					$resultData = array_merge($settingsDetails, $notificationDetails);
 					$resultArray = array(
-						'privacy_policy'=>$resultData['privacy_policy_en'],
-						'terms_and_conditions'=>$resultData['terms_and_conditions_en'],
+						'privacy_policy'=>$resultData['privacy_policy'],
+						'terms_and_conditions'=>$resultData['terms_and_conditions'],
 						'contact_number'=>$resultData['contact_number'],
 						'notification_status'=>$resultData['notification_status'] == 0? 0: 1,
 						'email_status'=>$resultData['email_status'] == 0? 0: 1