diff --git a/api/application/controllers/Flyhi_Controller.php b/api/application/controllers/Flyhi_Controller.php index 17c2a928..1659f7ad 100644 --- a/api/application/controllers/Flyhi_Controller.php +++ b/api/application/controllers/Flyhi_Controller.php @@ -2314,8 +2314,8 @@ class Flyhi_Controller extends REST_Controller { log_message('ERROR','### 5.6th User Choosen Files inx '.$i); $reponse = digital_locker::downloadFiles($reindexed_array[$i],$token); log_message('ERROR',"### 7 : Choosen Files reponse :".json_encode($reponse)); - $doc_name = str_replace(' ', '_',$digilocker_doc_name[$i]); - $doc_renamed = $applicant_name."_".$doc_name.'.pdf'; + $doc_name = $digilocker_doc_name[$i]; + $doc_renamed = strtolower(trim($applicant_name))."_".str_replace(' ', '_',$doc_name).'.pdf'; log_message('ERROR','### 7.1th doc_name '.$doc_renamed.' inx : '.$i); $src_local_file = XLPATH.'/tmp/'.$doc_renamed; $ifp = fopen( $src_local_file, 'wb' ); @@ -2344,7 +2344,7 @@ class Flyhi_Controller extends REST_Controller { if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200) { - $pd_document_data = array('fk_pd_id' => $pd_id,'img_type' => 2,'pd_document_title'=>$digilocker_doc_name[$i],'pd_document_name'=>$doc_renamed,'fk_form_id'=>18,'co_applicant_id'=>$applicant_id,'image_key' => 'person_met_id','content_type'=>3); + $pd_document_data = array('fk_pd_id' => $pd_id,'img_type' => 2,'pd_document_title'=>$digilocker_doc_name[$i],'pd_document_name'=>$doc_name,'fk_form_id'=>18,'co_applicant_id'=>$applicant_id,'image_key' => 'person_met_id','content_type'=>3); $pd_document_id = $this->Flyhi_Model->saveRecords($pd_document_data,PDDOCUMENTS); if($pd_document_id != "" || $pd_document_id != null){ $temp_flag++; } unlink($src_local_file); @@ -2470,7 +2470,7 @@ class Flyhi_Controller extends REST_Controller { $reponse = digital_locker::userCh_check3($code,$co_applicant); $view_data['token']= "response_data['token']"; $view_data['pd_id']="3258"; - $view_data['applicant_name']="Sanjeev "; + $view_data['applicant_name']="NBGTY ONMY OIK "; $view_data['applicant_id']="7128"; $view_data['pd_sno']="M7128"; $this->load->view("digital_locker",$view_data); @@ -2495,7 +2495,9 @@ $this->load->view("digital_locker",$view_data); log_message('ERROR','### 6 Form data : '.json_encode($form_data)); if(count($form_data)>0){ $doc_name = str_replace(' ', '_',$doc_name); - $doc_renamed = $applicant_name."_".$doc_name.'.pdf'; + //$doc_renamed = $applicant_name."_".$doc_name.'.pdf'; + $doc_renamed = strtolower(trim($applicant_name))."_".$doc_name.'.pdf'; + log_message('ERROR','### 6 Doc renamed : '.$doc_renamed); // $src_local_file = XLPATH.'/tmp/'.$doc_renamed; $src_local_file = XLPATH.'/pd_reports/'. $pd_id .'/'.$doc_renamed.'.pdf'; @@ -2528,7 +2530,7 @@ $this->load->view("digital_locker",$view_data); if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200) { - $pd_document_data = array('fk_pd_id' => $pd_id,'img_type' => 2,'pd_document_title'=>$doc_renamed,'pd_document_name'=>$doc_renamed,'fk_form_id'=>18,'co_applicant_id'=>$applicant_id,'image_key' => 'person_met_id','content_type'=>3); + $pd_document_data = array('fk_pd_id' => $pd_id,'img_type' => 2,'pd_document_title'=>$doc_renamed,'pd_document_name'=>$form_data['doc_name'],'fk_form_id'=>18,'co_applicant_id'=>$applicant_id,'image_key' => 'person_met_id','content_type'=>3); $pd_document_id = $this->Flyhi_Model->saveRecords($pd_document_data,PDDOCUMENTS); if($pd_document_id != "" || $pd_document_id != null){ $temp_flag++; } // unlink($src_local_file); diff --git a/api/application/helpers/digital_locker_helper.php b/api/application/helpers/digital_locker_helper.php index 9e95f286..8fac17e4 100644 --- a/api/application/helpers/digital_locker_helper.php +++ b/api/application/helpers/digital_locker_helper.php @@ -115,8 +115,10 @@ class DIGITAL_LOCKER } public static function userCh_check3($code,$applicant){ $CI =&get_instance(); - $CI->db->SELECT("fk_pd_id,pd_co_applicant_id,applicant_name"); + $CI->db->SELECT("PDAPPLICANTSDETAILS.fk_pd_id,PDAPPLICANTSDETAILS.pd_co_applicant_id,PDAPPLICANTSDETAILS.applicant_name, + PDTRIGGER.lender_applicant_id, PDTRIGGER.pd_sno"); $CI->db->FROM(PDAPPLICANTSDETAILS." as PDAPPLICANTSDETAILS"); + $CI->db->JOIN(PDTRIGGER .' as PDTRIGGER','PDAPPLICANTSDETAILS.fk_pd_id = PDTRIGGER.pd_id','LEFT'); $CI->db->WHERE("PDAPPLICANTSDETAILS.pd_co_applicant_id",$applicant); $CI->db->WHERE("PDAPPLICANTSDETAILS.isactive",1); $dtls = $CI->db->GET()->result_array(); diff --git a/api/application/views/digital_locker.php b/api/application/views/digital_locker.php index fc80b677..022a24c5 100644 --- a/api/application/views/digital_locker.php +++ b/api/application/views/digital_locker.php @@ -164,12 +164,12 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo '
'.$list['items'][$i]['issuer'].''; echo '
- - - - - - + + + + + +
';