Merge branch 'jansa'

admin/application/models/Webservice_model.php

@@ -2929,12 +2929,18 @@ class Webservice_model extends CI_Model {
 		$this->db->where('tbl_clinic_doctors.clinic_id','0');
 		$this->db->where('tbl_clinic_doctors.doctor_id',$id);
 		$query_default = $this->db->get()->result();
+		foreach ($query_default as $key => $value) {
+			$query_default[$key]->street_address = decrypt_data($value->street_address);
+			$query_default[$key]->locality = decrypt_data($value->locality);
+			$query_default[$key]->number = decrypt_data($value->number);
+			$query_default[$key]->complement = decrypt_data($value->complement);
+		}
 		$new_query = array_merge($query_default,$query);
 
 		//echo"<pre>";print_r($new_query);exit();
 		if(count($new_query) > 0){
 			foreach ($new_query as $key => $value) {
-				$location = decrypt_data($value->street_address).','.decrypt_data($value->locality).','.decrypt_data($value->number).','.decrypt_data($value->complement);
+				$location = $value->street_address.','.$value->locality.','.$value->number.','.$value->complement;
 				$new[$key]['id'] = $value->id;
 				$new[$key]['name'] = $value->name;
 				$new[$key]['email'] = $value->email;