From 3dd0dcf3782a3a1c6688425af50d00a209daf979 Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Wed, 18 Sep 2019 19:39:34 +0530 Subject: [PATCH] GEN FORM GET AWS URL CHANGED --- api/application/controllers/PD_Controller.php | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 7678397a..bfaf692d 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -982,8 +982,14 @@ class PD_Controller extends REST_Controller { $newpd['fk_customer_segment'] = $pd_details['fk_customer_segment']; $newpd['fk_address_id'] = $pd_details['fk_address_id']; $newpd['parent_pd_id'] = $pd_details['parent_pd_id']; - //$newpd['fk_pd_allocated_to'] = $pd_details['fk_pd_allocated_to'] ? $pd_details['fk_pd_allocated_to'] : null; - //$newpd['scheduled_on'] = $pd_details['scheduled_on'] ? $pd_details['scheduled_on'] : null; + + //Generate Random string + + /************ASSIGN Random URL******************/ + $newpd['random_string'] = $parent_pd_details[0]['random_string']; + $url = OFFICER_TRACKING_URL.$randomString; + $newpd['encrypted_url'] = $url; + $newpd['fk_pd_template_id'] = $this->assignPDTempalate(array('lender' => $newpd['fk_lender_id'],'product' => $newpd['fk_product_id'],'customer_segment' => $newpd['fk_customer_segment'])); //print_r($newpd);die(); @@ -2741,21 +2747,28 @@ public function getPDFormDetailsJSON_post() $custom_log_info = '###Get General FOrm IMG AWS urls & attach into JSON Function Called - ('. $pd_id.' - '. $pd_form_id.') - ' . date('Y-m-d H:i:s A'); log_message('ERROR',$custom_log_info); $result_data = $this->PD_Model->getSignedPDDocsURL($pd_id,18,null,null,null); - + //print_r($result_data); foreach($temp_rec['individuals'] as $g_key => $g_value) { if($g_value['is_person_met'] == true) { + + if(count($result_data)) { foreach($result_data as $img_key => $img_value) { - if($g_value['applicant_name'] == $img_value['pd_document_title']) + //$temp_rec['individuals'][$g_key]['is_person_met_pic'] = ""; + //$temp_rec['individuals'][$g_key]['is_person_met_id_proof'] = ""; + $applicant_name = trim($g_value['applicant_name']); + if( !strcasecmp($applicant_name,trim($img_value['pd_document_title']))) { $temp_rec['individuals'][$g_key]['is_person_met_pic'] = $img_value['doc_url']; + //echo 'SAME-'.$applicant_name.'-'.trim($img_value['pd_document_title']); + //echo $img_value['doc_url'];die(); } - if(($g_value['applicant_name'].'-id_proof') == $img_value['pd_document_title']) + if( !strcasecmp(($applicant_name.'-id_proof'),trim($img_value['pd_document_title'])) ) { $temp_rec['individuals'][$g_key]['is_person_met_id_proof'] = $img_value['doc_url']; } @@ -2763,7 +2776,8 @@ public function getPDFormDetailsJSON_post() } } } - + //print_r($temp_rec);die(); + $rec[0]['json'] = json_encode($temp_rec); $custom_log_info = '###Get General FOrm IMG AWS urls & attach into JSON Function End - ('. $pd_id.' - '. $pd_form_id.') - ' . date('Y-m-d H:i:s A'); log_message('ERROR',$custom_log_info); } @@ -2821,7 +2835,7 @@ public function getPDFormDetailsJSON_post() } } } - // print_r($result_data); + $rec[0]['json'] = json_encode($temp_rec); $custom_log_info = '###Get Business IMG AWS urls & attach into JSON Function End - ('. $pd_id.' - '. $pd_form_id.') - ' . date('Y-m-d H:i:s A'); log_message('ERROR',$custom_log_info);