From 5902760ee080a5bdcc79e191c47f56497316867f Mon Sep 17 00:00:00 2001 From: sanjeev Date: Mon, 29 Nov 2021 14:35:57 +0530 Subject: [PATCH] adv filter api smc lender agency key removed : ps --- api/application/controllers/PD_Controller.php | 4 ++-- api/application/models/PD_Model.php | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index c8da99db..40051d70 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2231,7 +2231,7 @@ public function assignPDTempalate($data) $date_type = isset($records['date_type']) ? (int)$records['date_type'] : null; // echo "After date_type ".$date_type." and my return type is ".gettype($date_type)."\n"; $client = isset($records['client']) ? $records['client'] : null; - $smc_agency_id = isset($records['smc_agency_id']) ? $records['smc_agency_id'] : null; + // $smc_agency_id = isset($records['smc_agency_id']) ? $records['smc_agency_id'] : null; $lender_details = array(); //if lender id exists, then make custom filter for only SMC usage @@ -2262,7 +2262,7 @@ public function assignPDTempalate($data) } - $result_data = $this->PD_Model->PDListwithGlobalFilters($pd_type,$pd_status,$pd_from_date,$pd_to_date,$pd_city,$pd_products,$pd_lender,$pd_applicant_name,$pd_applicant_lender_ref,$pd_officer_name,$include_archive,$pd_officer_id,$pd_agency_id,$vendor_pdofficer,$user_type,$createdby,$date_type,$client,$smc_agency_id); + $result_data = $this->PD_Model->PDListwithGlobalFilters($pd_type,$pd_status,$pd_from_date,$pd_to_date,$pd_city,$pd_products,$pd_lender,$pd_applicant_name,$pd_applicant_lender_ref,$pd_officer_name,$include_archive,$pd_officer_id,$pd_agency_id,$vendor_pdofficer,$user_type,$createdby,$date_type,$client); if(count($result_data)) { diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 3d8d686d..3826047b 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -213,7 +213,7 @@ class PD_Model extends SPARQ_Model { //PD List with Common Filters - public function PDListwithGlobalFilters($pd_type,$pd_status,$pd_from_date,$pd_to_date,$pd_city,$pd_products,$pd_lender,$pd_applicant_name,$pd_applicant_lender_ref,$pd_officer_name,$include_archive,$pd_officer_id,$pd_agency_id,$vendor_pdofficer,$user_type,$createdby,$date_type,$client,$smc_agency_id) + public function PDListwithGlobalFilters($pd_type,$pd_status,$pd_from_date,$pd_to_date,$pd_city,$pd_products,$pd_lender,$pd_applicant_name,$pd_applicant_lender_ref,$pd_officer_name,$include_archive,$pd_officer_id,$pd_agency_id,$vendor_pdofficer,$user_type,$createdby,$date_type,$client) { $limit = 1000; @@ -339,9 +339,6 @@ class PD_Model extends SPARQ_Model { $current_smc_lender_id = ENVIRONMENT == 'production' ? 7 : 35; //pk id of SMC in live and demo $this->db->WHERE('PDTRIGGER.fk_lender_id',$current_smc_lender_id); } - if($smc_agency_id != "" || $smc_agency_id != null){ - $this->db->WHERE('PDTRIGGER.pd_agency_id',$smc_agency_id); - } $this->db->ORDER_BY('PDTRIGGER.pd_id','DESC'); $this->db->LIMIT($limit,0);