Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Velz2020 2022-02-24 16:31:22 +05:30
commit 973933f0b8
5 changed files with 93 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
api/application/controllers/PD_Controller.php
View File

@ -4938,7 +4938,11 @@ public function getPDFormDetailsJSON_post()
$bucketname = LENDER_BUCKET_NAME_PREFIX.$pd_master_details[0]['fk_lender_id']; $bucketname = LENDER_BUCKET_NAME_PREFIX.$pd_master_details[0]['fk_lender_id'];
$main_applicant_name = $pd_master_details[0]['main_applicant']; $main_applicant_name = $pd_master_details[0]['main_applicant'];
$key = 'pd'.$pdid.'/pd_reports/'.$main_applicant_name.'.pdf'; $pdf_name = 'PD_REPORTS_'.$main_applicant_name;
// $key = 'pd'.$pdid.'/pd_reports/'.$main_applicant_name.'.pdf';
$type1_key = 'pd'.$pdid.'/pd_reports/'.$main_applicant_name.'.pdf';
$type2_key = 'pd'.$pdid.'/pd_reports/'.$pdf_name.'.pdf';
@ -4995,7 +4999,7 @@ public function getPDFormDetailsJSON_post()
{ {
$sourcefile = $output_file2; $sourcefile = $output_file2;
$bucket_data = array('bucket_name'=>$bucketname,'key'=>$key,'sourcefile'=>$sourcefile); $bucket_data = array('bucket_name'=>$bucketname,'key'=>$type2_key,'sourcefile'=>$sourcefile);
$s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data); $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data);
//print_r($s3result); //print_r($s3result);
if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200) if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200)
@ -5009,7 +5013,15 @@ public function getPDFormDetailsJSON_post()
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes'); // $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes');
$_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');
$headers = @get_headers($_uri);
if($headers && strpos( $headers[0], '200')) {
$singed_uri = $_uri;
}else {
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'30 minutes');
}
if($id != null || $id != "" ) if($id != null || $id != "" )
{ {
@ -5039,7 +5051,14 @@ public function getPDFormDetailsJSON_post()
else //If Qc not edited pull PDF uri from S3 else //If Qc not edited pull PDF uri from S3
{ {
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes'); // $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes');
$_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'+30 minutes');
$headers = @get_headers($_uri);
if($headers && strpos( $headers[0], '200')) {
$singed_uri = $_uri;
}else {
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'+30 minutes');
}
if($singed_uri != null || $singed_uri != "" ) if($singed_uri != null || $singed_uri != "" )
{ {

49
api/application/controllers/SMC_Credit_PD_Controller.php
View File

@ -168,20 +168,27 @@ class SMC_Credit_PD_Controller extends REST_Controller {
$where_condition_array = array('SMC_CREDIT_PD.smc_credit_pd' => $smc_credit_pd); $where_condition_array = array('SMC_CREDIT_PD.smc_credit_pd' => $smc_credit_pd);
$SMC_CREDIT_PD = $this->SMC_Credit_PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); $SMC_CREDIT_PD = $this->SMC_Credit_PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array);
//print_r($SMC_CREDIT_PD);die();
if($SMC_CREDIT_PD) if($SMC_CREDIT_PD)
{ {
ini_set('max_execution_time', 0); ini_set('max_execution_time', 0);
$bucket_name = LENDER_BUCKET_NAME_PREFIX.$SMC_CREDIT_PD[0]['lender_id']; $bucket_name = LENDER_BUCKET_NAME_PREFIX.$SMC_CREDIT_PD[0]['lender_id'];
$pdf_name = strtolower(trim($SMC_CREDIT_PD[0]['applicant_name']));
$pdf_name .= '-'.$SMC_CREDIT_PD[0]['abbr']; // 1st Type Key name. (name,abbr and date).
$pdf_name .= '-'.(date('dmY',strtotime($SMC_CREDIT_PD[0]['completed_date']))); $type1_pdf_name = strtolower(trim($SMC_CREDIT_PD[0]['applicant_name']));
$this->PD_Model->updateRecords(array('pd_report_filename' => $pdf_name),SMC_CREDIT_PD,array('SMC_CREDIT_PD.smc_credit_pd' => $smc_credit_pd)); $type1_pdf_name .= '-'.$SMC_CREDIT_PD[0]['abbr'];
$type1_pdf_name .= '-'.(date('dmY',strtotime($SMC_CREDIT_PD[0]['completed_date'])));
// 2nd Type Key name. (name,type,abbr and date).
$type2_pdf_name = strtolower(trim($SMC_CREDIT_PD[0]['applicant_name']));
$type2_pdf_name .= '-'.$SMC_CREDIT_PD[0]['abbr'];
$type2_pdf_name .= 'PD_Report-'.(date('dmY',strtotime($SMC_CREDIT_PD[0]['completed_date'])));
// $this->PD_Model->updateRecords(array('pd_report_filename' => $pdf_name),SMC_CREDIT_PD,array('smc_credit_pd' => $smc_credit_pd));
//$pdf_name = str_replace(' ', '_', $pdf_name); //$pdf_name = str_replace(' ', '_', $pdf_name);
$type1_key = 'sales_pd/'.$smc_credit_pd.'/'.$type1_pdf_name.'.pdf';
$key = 'sales_pd/'.$smc_credit_pd.'/'.$pdf_name.'.pdf'; $type2_key = 'sales_pd/'.$smc_credit_pd.'/'.$type2_pdf_name.'.pdf';
if(!file_exists($this->external_path.'/sales_pd/'.$smc_credit_pd)) if(!file_exists($this->external_path.'/sales_pd/'.$smc_credit_pd))
{ {
@ -217,7 +224,7 @@ class SMC_Credit_PD_Controller extends REST_Controller {
$bytes = file_put_contents($output_file, $pdf_doc); $bytes = file_put_contents($output_file, $pdf_doc);
// echo $bytes; // echo $bytes;
// die(); // die();
$bucket_data = array('bucket_name'=>$bucket_name,'key'=>$key,'sourcefile'=>$this->external_path.'/sales_pd/'.$smc_credit_pd.'/temp.pdf'); $bucket_data = array('bucket_name'=>$bucket_name,'key'=>$type2_key,'sourcefile'=>$this->external_path.'/sales_pd/'.$smc_credit_pd.'/temp.pdf');
log_message('ERROR','####SALES PD REPORT UPLOAD TO S3'.$smc_credit_pd); log_message('ERROR','####SALES PD REPORT UPLOAD TO S3'.$smc_credit_pd);
$s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data); $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data);
@ -227,7 +234,14 @@ class SMC_Credit_PD_Controller extends REST_Controller {
$this->SMC_Credit_PD_Model->updateRecords(array('is_pdf' => 1, 'is_edited' => 0),SMC_CREDIT_PD,array('smc_credit_pd' => $smc_credit_pd)); $this->SMC_Credit_PD_Model->updateRecords(array('is_pdf' => 1, 'is_edited' => 0),SMC_CREDIT_PD,array('smc_credit_pd' => $smc_credit_pd));
if($api) if($api)
{ {
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes'); // $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes');
$_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'30 minutes');
$headers = @get_headers($_uri);
if($headers && strpos( $headers[0], '200')) {
$singed_uri = $_uri;
}else {
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');
}
$data['dataStatus'] = true; $data['dataStatus'] = true;
$data['status'] = REST_Controller::HTTP_OK; $data['status'] = REST_Controller::HTTP_OK;
$data['records'] = $singed_uri; $data['records'] = $singed_uri;
@ -1630,22 +1644,31 @@ public function filterSalesPDList_post() {
} }
// echo $html_content;exit(); // echo $html_content;exit();
$pdf_name = $view_data['pd_master_details'][0]['main_applicant']; $type1_pdf_name = $view_data['pd_master_details'][0]['main_applicant'];
$type2_pdf_name = "PD_Report_".$view_data['pd_master_details'][0]['main_applicant'];
$pdf_doc = $this->pdfgenerator->generate($html_content, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait"); $pdf_doc = $this->pdfgenerator->generate($html_content, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait");
//End of PDF Gen using DOM PDF //End of PDF Gen using DOM PDF
$output_file = $this->external_path ."/pd_reports/" . $records['pd_id'] . "/temp.pdf"; $output_file = $this->external_path ."/pd_reports/" . $records['pd_id'] . "/temp.pdf";
$bytes = file_put_contents($output_file, $pdf_doc); $bytes = file_put_contents($output_file, $pdf_doc);
//echo $bytes;die(); //echo $bytes;die();
$bucket_name = LENDER_BUCKET_NAME_PREFIX.(ENVIRONMENT == 'production' ? 7 : 35); $bucket_name = LENDER_BUCKET_NAME_PREFIX.(ENVIRONMENT == 'production' ? 7 : 35);
$key = 'pd'.$records['pd_id'].'/pd_reports/'.$pdf_name.'.pdf'; $type1_key = 'pd'.$records['pd_id'].'/pd_reports/'.$type1_pdf_name.'.pdf';
$bucket_data = array('bucket_name'=>$bucket_name,'key'=>$key,'sourcefile'=>$output_file); $type2_key = 'pd'.$records['pd_id'].'/pd_reports/'.$type2_pdf_name.'.pdf';
$bucket_data = array('bucket_name'=>$bucket_name,'key'=>$type2_key,'sourcefile'=>$output_file);
$s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data); $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data);
if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200) if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200)
{ {
// $this->Sales_PD_Model->updateRecords(array('is_pdf' => 1, 'is_edited' => 0),SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id)); // $this->Sales_PD_Model->updateRecords(array('is_pdf' => 1, 'is_edited' => 0),SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id));
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes'); // $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes');
$_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');
$headers = @get_headers($_uri);
if($headers && strpos( $headers[0], '200')) {
$singed_uri = $_uri;
}else {
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'30 minutes');
}
$data['dataStatus'] = true; $data['dataStatus'] = true;
$data['status'] = REST_Controller::HTTP_OK; $data['status'] = REST_Controller::HTTP_OK;
$data['records'] = $singed_uri; $data['records'] = $singed_uri;

32
api/application/controllers/Sales_PD_Controller.php
View File

@ -180,16 +180,20 @@ class Sales_PD_Controller extends REST_Controller {
{ {
ini_set('max_execution_time', 0); ini_set('max_execution_time', 0);
$bucket_name = LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id']; $bucket_name = LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id'];
$pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name'])); // 1st Type Key name. (name,abbr and date).
$pdf_name .= '-'.$pd_type.$sales_pd_data[0]['abbr']; $type1_pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name']));
$pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date']))); $type1_pdf_name .= '-'.$sales_pd_data[0]['abbr'];
//$pdf_name = str_replace(' ', '_', $pdf_name); $type1_pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date'])));
$old_pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name']));
$old_pdf_name .= '-'.$sales_pd_data[0]['abbr'];
$old_pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date'])));
$old_key = 'sales_pd/'.$sales_pd_id.'/'.$old_pdf_name.'.pdf';
$key = 'sales_pd/'.$sales_pd_id.'/'.$pdf_name.'.pdf'; // 2nd Type Key name. (name,type,abbr and date).
$type2_pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name']));
$type2_pdf_name .= '-'.$pd_type.$sales_pd_data[0]['abbr'];
$type2_pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date'])));
//$this->Sales_PD_Model->updateRecords(array('pd_report_filename' => 'PD_Report-'.$pdf_name),SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id));
$type1_key = 'sales_pd/'.$sales_pd_id.'/'.$type1_pdf_name.'.pdf';
$type2_key = 'sales_pd/'.$sales_pd_id.'/'.$type2_pdf_name.'.pdf';
if(!file_exists($this->external_path.'/sales_pd/'.$sales_pd_id)) if(!file_exists($this->external_path.'/sales_pd/'.$sales_pd_id))
{ {
@ -223,7 +227,7 @@ class Sales_PD_Controller extends REST_Controller {
$bytes = file_put_contents($output_file, $pdf_doc); $bytes = file_put_contents($output_file, $pdf_doc);
//echo $bytes; //echo $bytes;
//die(); //die();
$bucket_data = array('bucket_name'=>$bucket_name,'key'=>$key,'sourcefile'=>$this->external_path.'/sales_pd/'.$sales_pd_id.'/temp.pdf'); $bucket_data = array('bucket_name'=>$bucket_name,'key'=>$type2_key,'sourcefile'=>$this->external_path.'/sales_pd/'.$sales_pd_id.'/temp.pdf');
log_message('ERROR','####SALES PD REPORT UPLOAD TO S3'.$sales_pd_id); log_message('ERROR','####SALES PD REPORT UPLOAD TO S3'.$sales_pd_id);
$s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data); $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data);
@ -233,12 +237,12 @@ class Sales_PD_Controller extends REST_Controller {
$this->Sales_PD_Model->updateRecords(array('is_pdf' => 1, 'is_edited' => 0),SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id)); $this->Sales_PD_Model->updateRecords(array('is_pdf' => 1, 'is_edited' => 0),SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id));
if($api) if($api)
{ {
$_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes'); $_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');
$headers = @get_headers($_uri); $headers = @get_headers($_uri);
if($headers && strpos( $headers[0], '200')) { if($headers && strpos( $headers[0], '200')) {
$singed_uri = $_uri; $singed_uri = $_uri;
}else { }else {
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes'); $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'30 minutes');
} }
$data['dataStatus'] = true; $data['dataStatus'] = true;
$data['status'] = REST_Controller::HTTP_OK; $data['status'] = REST_Controller::HTTP_OK;
@ -252,12 +256,12 @@ class Sales_PD_Controller extends REST_Controller {
if($api) if($api)
{ {
## NEW KEY BECAUSE TITLE-RENAME ## NEW KEY BECAUSE TITLE-RENAME
$_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes'); $_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type2_key,'30 minutes');
$headers = @get_headers($_uri); $headers = @get_headers($_uri);
if($headers && strpos( $headers[0], '200')) { if($headers && strpos( $headers[0], '200')) {
$singed_uri = $_uri; $singed_uri = $_uri;
}else { }else {
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes'); $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$type1_key,'30 minutes');
} }
$data['dataStatus'] = true; $data['dataStatus'] = true;
$data['status'] = REST_Controller::HTTP_OK; $data['status'] = REST_Controller::HTTP_OK;

28
api/application/controllers/Template_Management_Controller.php
View File

@ -1089,24 +1089,20 @@ class Template_Management_Controller extends REST_Controller {
$status = strtoupper(str_replace(' ', '',$records['form_status'])); $status = strtoupper(str_replace(' ', '',$records['form_status']));
$where_condition_array = array('map_id'=>$map_id,"form_id"=>$form_id,"isactive"=>1); $where_condition_array = array('map_id'=>$map_id,"form_id"=>$form_id,"isactive"=>1);
$json_table = $this->Template_Management_Model->selectCustomRecords($fields,$where_condition_array,TEMPLATE_JSON_V2); $json_table = $this->Template_Management_Model->selectCustomRecords($fields,$where_condition_array,TEMPLATE_JSON_V2);
if(count($json_table)>0 && $status == "COMPLETED"){ foreach ($json_table as $value) $id_array[] = $value['id'];
$this->db->where('id',$json_table[0]['id']); if(count($json_table)>0 && $status == "COMPLETED"){
$this->db->where_in('id',$id_array);
$this->db->set('isactive',0); $this->db->set('isactive',0);
$this->db->update(TEMPLATE_JSON_V2); $this->db->update(TEMPLATE_JSON_V2);
}else if(count($json_table)>0 && ($status == "DRAFT" || $status == "APPROVED" )){ }else if(count($json_table)>0 && ($status == "DRAFT" || $status == "APPROVED")){
$json = json_encode($records['json'],true); $this->db->where('is_form_status',"COMPLETED");
$this->db->where('id',$json_table[0]['id']); $this->db->where_in('id',$id_array);
$this->db->where('map_id',$map_id); $this->db->set('isactive',0);
$this->db->where('form_id',$form_id); $this->db->update(TEMPLATE_JSON_V2);
$this->db->where('is_form_status',$status); }
$this->db->set('json',$json); $json = json_encode($records['json'],true);
$this->db->update(TEMPLATE_JSON_V2); $fields = array('form_id' => $form_id,'json' => $json,'map_id'=>$map_id,'is_form_status'=>$status);
$json_pk_id = $json_table[0]['id']; $json_pk_id = $this->Template_Management_Model->saveTemplateMapping($fields,TEMPLATE_JSON_V2);
}else{
$json = json_encode($records['json'],true);
$fields = array('form_id' => $form_id,'json' => $json,'map_id'=>$map_id,'is_form_status'=>$status);
$json_pk_id = $this->Template_Management_Model->saveTemplateMapping($fields,TEMPLATE_JSON_V2);
}
if($json_pk_id) if($json_pk_id)
{ {
$data['dataStatus'] = true; $data['dataStatus'] = true;

2
api/application/models/Template_Management_Model.php
View File

@ -314,7 +314,7 @@ class Template_Management_Model extends SPARQ_Model {
} }
public function getTemplateFormsV2($value){ public function getTemplateFormsV2($value){
$this->db->SELECT('TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.json,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form,PDFORMS.pd_form_order'); $this->db->SELECT('TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.json,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form,PDFORMS.pd_form_order,TEMPLATE_JSON_V2.is_form_status');
$this->db->FROM(TEMPLATE_JSON_V2.' as TEMPLATE_JSON_V2'); $this->db->FROM(TEMPLATE_JSON_V2.' as TEMPLATE_JSON_V2');
$this->db->JOIN(PDFORMS.' as PDFORMS','TEMPLATE_JSON_V2.form_id = PDFORMS.pd_form_id','LEFT'); $this->db->JOIN(PDFORMS.' as PDFORMS','TEMPLATE_JSON_V2.form_id = PDFORMS.pd_form_id','LEFT');
$this->db->WHERE('TEMPLATE_JSON_V2.isactive',1); $this->db->WHERE('TEMPLATE_JSON_V2.isactive',1);