filter issue fix

application/controllers/Ride.php

@@ -573,6 +573,7 @@ class Ride extends CI_Controller {
 
 		$company_data = '';
 		if($this->session->userdata['user_type'] == 1){
+			$company_id = '';
 			$broker_id = (!isset($_POST['company_id']) || 
 						  empty($company_id = $_POST['company_id']))?'':$broker_id;
 

application/models/Ride_model.php

@@ -42,15 +42,12 @@ class Ride_model extends CI_Model {
 		return ($status)?1:0;
 	}
 
-	function getRideData($ride_id = '',$company_id = '',$broker_id = '',$scheduled = '',$condArr = array()){
-		$cond = (!empty($ride_id))?" AND TD.transport_id = '$ride_id'":"";
+	function getRideData($ride_id='',$company_id='',$broker_id='',$scheduled='',$condArr=array()){
+		$cond  = (!empty($ride_id))?" AND TD.transport_id = '$ride_id'":"";
 		$cond .= ($broker_id != '')?" AND TD.broker_id = '$broker_id'":"";
+		$cond .= ($scheduled != '')?" AND TD.is_scheduled = '$scheduled'":"";
 		$cond .= (!empty($company_id))?" AND TD.company_id = '$company_id'":"";
 
-		if($scheduled != ''){
-			$cond .= " AND TD.is_scheduled = '$scheduled'";
-		}
-
 		if(!empty($condArr)){
 			$cond .= implode(' ', $condArr);
 		}
@@ -64,8 +61,9 @@ class Ride_model extends CI_Model {
 				LEFT JOIN trip_status AS TS ON (TS.trip_status_id = TD.trip_status)
 				LEFT JOIN vehicle_types AS VH ON (VH.vehicle_id = TD.vehicle_type)
 				LEFT JOIN appointment_reason AS AR ON (AR.reason_id = TD.reason_code)
-				WHERE TD.status != '2' ".$cond."
+				WHERE TD.status != '2' ".$cond." 
 				ORDER BY TD.transport_id DESC";
+
 		$ride_data = $this->db->query($sql);
 		if(empty($ride_data)){
 			return;