Merge branch 'master' into 'dev_production'

application/models/Webservice_model.php

@@ -2124,10 +2124,14 @@ class Webservice_model extends CI_Model {
 			    curl_setopt($ch,CURLOPT_HTTPHEADER,array('Content-Type:application/json')); 
 			    $result = curl_exec($ch);
 			    curl_close($ch);
+			    if(!empty($result)){
 			    	$result = json_decode($result);
 			    	$result->status->trackingId = (!isset($data['nextToken']) && empty($data['nextToken']))?$trackingId:$data['trackingId'];
 			    	$res = array('status'=>1,'data'=>array('itineraries'=> $result));
 			    }else{
+			    	$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER07');
+			    }
+			}else{
 				$res = array('status'=>0,'message'=>'User Authentication Error','code'=>'ER10');
 			}
     	}catch(Exception $e){