From 8e4288fa75c50b29924642934cfbcfcdd991ff64 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 7 Mar 2023 17:35:20 +0530 Subject: [PATCH] live Fixes : ps --- api/application/controllers/PD_Controller.php | 54 +++++++++---------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index bb080746..292d7e9f 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2011,19 +2011,20 @@ class PD_Controller extends REST_Controller $smc_lender_id = ENVIRONMENT == 'production' ? 7 : 35; //pk id of SMC in live and demo if ($lenderid == $smc_lender_id) { - // $this->load->model('User_Management_Model'); - // $user_details = $this->User_Management_Model->getUserDetails($createdby); - // if($user_details['data'][0]['user_role'] == 26)//Credit Manager - // { - // $pdofficerid = $createdby; + $this->load->model('User_Management_Model'); + $user_details = $this->User_Management_Model->getUserDetails($createdby); + if($user_details['data'][0]['user_role'] == 26)//Credit Manager + { + $pdofficerid = $createdby; - // } - // else if($user_details['data'][0]['user_role'] == 27)//Reg Credit Manager - // { - // $lender_details = array('city' => $user_details['data'][0]['fk_city']); + } + else if($user_details['data'][0]['user_role'] == 27)//Reg Credit Manager + { + $lender_details = array('city' => $user_details['data'][0]['fk_city']); - // } - $createdby = ''; + } + if($user_details['data'][0]['user_role'] == 29) $pdofficerid = $createdby; + $createdby = ''; } // $lender_details = $this->getLenderHierarchyForPDListing($lenderid); @@ -2031,7 +2032,7 @@ class PD_Controller extends REST_Controller } // die(); $result_data = $this->PD_Model->listLessPDDetails($page, $limit, $sort, $pdofficerid, $datetype, $fdate, $tdate, $lenderid, $status, $lender_details, $pdagencyid, $vendor_pdofficer, $user_type, $createdby, $client, $is_smc_vendor); - // echo count($result_data['data']);die(); + if ($result_data['data_status'] == true) { $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; @@ -2137,32 +2138,29 @@ class PD_Controller extends REST_Controller $lender_details = array(); //if lender id exists, then make custom filter for only SMC usage - if ($pd_lender) { + if ($pd_lender) { $smc_lender_id = ENVIRONMENT == 'production' ? 7 : 35; //pk id of SMC in live and demo if ($pd_lender == $smc_lender_id) { + $this->load->model('User_Management_Model'); + $user_details = $this->User_Management_Model->getUserDetails($createdby); + if($user_details['data'][0]['user_role'] == 26)//Credit Manager + { + $pd_officer_id = $createdby; + } + else if($user_details['data'][0]['user_role'] == 27)//Reg Credit Manager + { + $pd_city = array( $user_details['data'][0]['fk_city'] ); + } + if($user_details['data'][0]['user_role'] == 29) $pd_officer_id = $createdby; $createdby = ''; - // $this->load->model('User_Management_Model'); - // $user_details = $this->User_Management_Model->getUserDetails($createdby); - // if($user_details['data'][0]['user_role'] == 26)//Credit Manager - // { - // $pd_officer_id = $createdby; - - // } - // else if($user_details['data'][0]['user_role'] == 27)//Reg Credit Manager - // { - // $pd_city = array( $user_details['data'][0]['fk_city'] ); - - // } - } // $lender_details = $this->getLenderHierarchyForPDListing($lenderid); } - + $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, $is_smc_vendor); - if (count($result_data)) { $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK;