MINIOR ISSUE ON SMC LATE REQUIREMENTS

api/application/controllers/PD_Controller.php

@@ -602,7 +602,7 @@ class PD_Controller extends REST_Controller {
 			 	if(count($regional_credit_manager))
 			 	{
 			 		$pd_details['fk_pd_allocated_to'] = $regional_credit_manager[0]['userid'];
-			 		$pd_details['status'] = ALLOCATED;
+			 		$pd_details['pd_status'] = ALLOCATED;
 			 	}
 			 	else
 			 	{
@@ -2075,19 +2075,20 @@ public function assignPDTempalate($data)
 					$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;
-							$createdby = '';
+							
 						}
 						else if($user_details['data'][0]['user_role'] == 27)//Reg Credit Manager
 						{
 							$lender_details = array('city' => $user_details['data'][0]['fk_city']);
-							$createdby = '';
-						}
 							
+						}
+						$createdby = '';
 
 					}
 
@@ -2096,7 +2097,7 @@ public function assignPDTempalate($data)
 				}
 				// die();
 			$result_data = $this->PD_Model->listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate,$lenderid,$status,$lender_details,$pdagencyid,$vendor_pdofficer,$user_type,$createdby);
-			
+			 // echo count($result_data['data']);die();
 			if($result_data['data_status'] == true)
 			{
 				$data['dataStatus'] = true;
@@ -2195,11 +2196,40 @@ public function assignPDTempalate($data)
 			$pd_applicant_lender_ref = strtolower($records['pd_applicant_id']);
 			$pd_officer_name = isset($records['pd_officer']) ? $records['pd_officer'] : null ;
 			$pd_officer_id = isset($records['pd_officer_id']) ? $records['pd_officer_id'] : null ;
-			$include_archive = $records['is_include_archived'];
+			$include_archive = isset($records['is_include_archived']) ? $records['is_include_archived'] : null;
-			$pd_agency_id = $records['pd_agency_id'];
+			$pd_agency_id = isset($records['pd_agency_id']) ? $records['pd_agency_id'] : null;
-			$vendor_pdofficer = $records['vendor_pdofficer'];
+			$vendor_pdofficer = isset($records['vendor_pdofficer']) ? $records['vendor_pdofficer'] : null;
-			$user_type = $records['user_type'];
+			$user_type = isset($records['user_type']) ?  $records['user_type'] : null;
 			$createdby = $records['createdby'];
+			$lender_details = array();
+			//if lender id exists, then make custom filter for only SMC usage
+			
+			if($pd_lender)  
+				{ 
+					$smc_lender_id = ENVIRONMENT == 'production' ? 7 : 35; //pk id of SMC in live and demo 
+					if($pd_lender = $smc_lender_id)
+					{
+						$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);
 			
 			if(count($result_data))

api/application/controllers/SMC_Credit_PD_Controller.php

@@ -1311,7 +1311,7 @@ public function filterSalesPDList_post() {
 	  	// print_r($pd_master_data);die();
 	  	// echo $records['form_id'];die();
 	  	//check excel file in local, otherwise get it from s3 and store locallly
-	  	$filename = (!$pd_master_data[0]['re_uploaded'] ? XLPATH.'/tmp/'.$pd_master_data[0]['re_uploaded_file_name'] : XLPATH.'/tmp/'.$pd_master_data[0]['modified_fname']);
+	  	$filename = ($pd_master_data[0]['re_uploaded'] ? XLPATH.'/tmp/'.$pd_master_data[0]['re_uploaded_file_name'] : XLPATH.'/tmp/'.$pd_master_data[0]['modified_fname']);
 
 	  	// $filename = XLPATH.'/tmp/mySMCPD_client_working.xlsx';
 	  	// $filename = 'C:\Users\Venba\Downloads\Kathir Info Pvt.xlsx';
@@ -1321,7 +1321,7 @@ public function filterSalesPDList_post() {
 
 	  		//echo 'getting it from s3';
 	  		$bucket_name = LENDER_BUCKET_NAME_PREFIX.$pd_master_data[0]['fk_lender_id'];
-	  		$key = 'tmp/'. $pd_master_data[0]['modified_fname'];
+	  		$key = 'tmp/'. ($pd_master_data[0]['re_uploaded'] ? $pd_master_data[0]['re_uploaded_file_name'] : $pd_master_data[0]['modified_fname']);
 	  		$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'+5 minutes');
 	  		//echo $singed_uri;	
 	  		$sucess = file_put_contents($filename, file_get_contents($singed_uri));