Merge branch 'jansa'

admin/application/models/Webservice_model.php

@@ -1085,6 +1085,11 @@ class Webservice_model extends CI_Model {
 			$query['street_address'] = decrypt_data($query['street_address']);
 			$query['locality'] = decrypt_data($query['locality']);
 			$query['number'] = decrypt_data($query['number']);
+			if(isset($query['telephone']) && $query['telephone'] != ''){
+				$query['telephone'] = decrypt_data($query['telephone']);
+			}else{
+				$query['telephone'] = '';
+			}
 
 			$return_array = array('status'=>'success','data'=>$query);
 		}
@@ -3991,7 +3996,7 @@ class Webservice_model extends CI_Model {
     		unset($res->locality);
     		unset($res->number);
     		unset($res->complement);
-    		print_r($res);exit();
+    		//print_r($res);exit();
 			if(isset($res->telephone) && (($res->telephone != '') || $res->telephone != null)){
 				$new[0] = decrypt_data($res->telephone);
 		    	$res->phone =$new;