From 005ab703997adf052dcf7da7cffe57fa39adb189 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 21 Feb 2023 12:35:51 +0530 Subject: [PATCH] Cet App Sales pd : ps --- .../controllers/Sales_PD_Controller.php | 8 +++-- .../helpers/cet_salespd_helper.php | 34 +++++++++++-------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 90ead237..c8f7afc6 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -451,7 +451,8 @@ class Sales_PD_Controller extends REST_Controller { $common_fields = array('pdid'=>$sales_pd_data[0]['sales_pd_id'], 'product'=>$sales_pd_data[0]['abbr'], - 'caseno'=>$sales_pd_data[0]['sales_pd_sno']); + 'caseno'=>$sales_pd_data[0]['sales_pd_sno'], + 'completed_date'=>$sales_pd_data[0]['completed_date']); foreach ($all_section_data as $sec_key => $section) { @@ -472,6 +473,7 @@ class Sales_PD_Controller extends REST_Controller { } } } + // print_r($common_fields);die(); $result = cet_salespd::pushwithcetsalespdapi($common_fields,$CETAPP_salesPD_data,1); if(isset($result->status) && $result->status == 200){ $photograph_data = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name !=' => 'satellite','isactive' => 1),SALEPD_DOCS); @@ -1212,7 +1214,7 @@ class Sales_PD_Controller extends REST_Controller { if(count($selfie)) { $bucket_name = LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id']; - $bucket_key = "sales_pd/".$records['sales_pd_id']."/images/".$selfie[0]['img'].".png"; + $bucket_key = "sales_pd/".$records['sales_pd_id']."/images/".$selfie[0]['img_name'].".png"; $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name, $bucket_key, '30 minutes'); $photo_questions['questions'][$key]['answer_value'] = $singed_uri; // $photo_questions['questions'][$key]['answer_value'] = $selfie[0]['img']; @@ -1237,7 +1239,7 @@ class Sales_PD_Controller extends REST_Controller { if($individual_value['questions'][0]['question_key'] == $img_value['img_name']) { $bucket_name = LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id']; - $bucket_key = "sales_pd/".$records['sales_pd_id']."/images/".$img_value['img'].".png"; + $bucket_key = "sales_pd/".$records['sales_pd_id']."/images/".$img_value['img_name'].".png"; $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name, $bucket_key,'30 minutes'); $photo_questions['questions'][$key]['questions_group'][$v_key]['questions'][0]['answer_value'] = $singed_uri; // $photo_questions['questions'][$key]['questions_group'][$v_key]['questions'][0]['answer_value'] = $img_value['img']; diff --git a/api/application/helpers/cet_salespd_helper.php b/api/application/helpers/cet_salespd_helper.php index c1e60eff..ab9828d1 100644 --- a/api/application/helpers/cet_salespd_helper.php +++ b/api/application/helpers/cet_salespd_helper.php @@ -52,20 +52,26 @@ class CET_SALESPD $fields['data'] = $data; $pdid = $fields['pdid']; $headers = array('Content-Type: application/json'); - $ch = curl_init(); - $output_data = json_encode( $fields ); - // print_r($output_data);die(); - log_message('ERROR',"PullSalesPDData api Request Format : ".$output_data); - curl_setopt( $ch,CURLOPT_URL, CET_SALESPD_INTEGRATION_URL); - curl_setopt( $ch,CURLOPT_POST, true ); - curl_setopt( $ch,CURLOPT_HTTPHEADER, $headers ); - curl_setopt( $ch,CURLOPT_RETURNTRANSFER, true ); - curl_setopt( $ch,CURLOPT_SSL_VERIFYPEER, true ); - curl_setopt( $ch,CURLOPT_POSTFIELDS, $output_data); - $result = curl_exec($ch ); - $response = json_decode($result); - log_message('ERROR',"CET APP SALES PDID (".$pdid.") "."PullSalesPDData api response :".json_encode($response)); - curl_close( $ch ); + try{ + $ch = curl_init(); + $output_data = json_encode( $fields ); + // print_r($output_data);die(); + log_message('ERROR',"PullSalesPDData api Request Format : ".$output_data); + curl_setopt( $ch,CURLOPT_URL, CET_SALESPD_INTEGRATION_URL); + curl_setopt( $ch,CURLOPT_POST, true ); + curl_setopt( $ch,CURLOPT_HTTPHEADER, $headers ); + curl_setopt( $ch,CURLOPT_RETURNTRANSFER, true ); + curl_setopt( $ch,CURLOPT_SSL_VERIFYPEER, true ); + curl_setopt( $ch,CURLOPT_POSTFIELDS, $output_data); + $result = curl_exec($ch ); + $response = json_decode($result); + log_message('ERROR',"CET APP SALES PDID (".$pdid.") "."PullSalesPDData api response :".json_encode($response)); + curl_close( $ch ); + } + catch (Exception $e) { + $response = array(); + log_message('ERROR', "CET APP SALES PDID (".$pdid.") ERR : " . $e->getMessage()); + } return $response; }