diff --git a/api/application/controllers/Flyhi_Controller.php b/api/application/controllers/Flyhi_Controller.php index 4aba0268..562def5a 100644 --- a/api/application/controllers/Flyhi_Controller.php +++ b/api/application/controllers/Flyhi_Controller.php @@ -243,12 +243,12 @@ class Flyhi_Controller extends REST_Controller { public function listFlyhiPD_get(){ - $user_id = $this->uri->segment(1); + $user_id = $this->uri->segment(2); $lender_id = $this->Flyhi_Model->getEntityFromUserdetails($user_id); $FHFSL_lender = (ENVIRONMENT == 'production' ? 19 : 31); if($lender_id == $FHFSL_lender) $sales_pd_type_master_query = '(CASE WHEN SALES_PD_DATA.sales_pd_type = 3 THEN "Workplace verification" WHEN SALES_PD_DATA.sales_pd_type = 4 THEN "Residence verification" ELSE "-" END) AS sales_pd_type_master'; - else $sales_pd_type_master_query = '(IF SALES_PD_DATA.sales_pd_type = 5 THEN "-" END IF) AS sales_pd_type_master'; + else $sales_pd_type_master_query = 'IF(SALES_PD_DATA.sales_pd_type = 5, "-", "-") AS sales_pd_type_master'; $columns = array('SALES_PD_DATA.sales_pd_id','SALES_PD_DATA.sales_pd_sno','SALES_PD_DATA.applicant_name','concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as officer_name','SALES_PD_DATA.applicant_id','SALES_PD_DATA.lender_id','SALES_PD_DATA.is_pdf','SALES_PD_DATA.is_edited','ENTITY.full_name','ENTITY.short_name','SALES_PD_DATA.status','SALES_PD_DATA.sales_pd_type','SALES_PD_DATA.rand_string','SALES_PD_DATA.isactive','SALES_PD_DATA.city_id','CITY.name as city_name', 'SALES_PD_DATA.lender_sales_person','concat(LENDERSALESPERSON.first_name," ",LENDERSALESPERSON.last_name) as lender_sales_person_name','LENDERSALESPERSON.mobile_no as lender_sales_contact_mobileno','LENDERSALESPERSON.email as lender_sales_person_email', @@ -299,7 +299,7 @@ class Flyhi_Controller extends REST_Controller { $order_by = 'SALES_PD_DATA.sales_pd_id'; $Flyhi_pd_data = $this->Flyhi_Model->getJoinRecords($columns,$table,$joins,$where_condition_array,$order_by,'DESC','',$or_where); - // print_r($this->db->last_query());die(); + //print_r($this->db->last_query());die(); if(count($Flyhi_pd_data)) { diff --git a/api/application/models/Flyhi_Model.php b/api/application/models/Flyhi_Model.php index e815935d..d2aca20b 100644 --- a/api/application/models/Flyhi_Model.php +++ b/api/application/models/Flyhi_Model.php @@ -102,4 +102,13 @@ class Flyhi_Model extends SPARQ_Model { return $this->db->query($sql)->result_array(); } + public function getEntityFromUserdetails($user_id){ + $query = $this->db->where('userid',$user_id)->get(USERPROFILE); + if ($query->num_rows() > 0) + { + $ret = $query->row(); + return $ret->fk_entity_id; + }else return null; + } + } \ No newline at end of file