diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index fae3a60d..58dda4f5 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -6070,7 +6070,7 @@ public function getPDFormDetailsJSON_post() // $res = SMS_GUPSHUP::sendSMS($msg,9715454901 ,array(),true); //print_r($res); //PDALERTS::pdnotification(1797); - // $this->aws_cognito->adminSetUserPassword('sineedge2019@gmail.com'); + // $this->aws_cognito->adminSetUserPassword('prashant.unjia@yahoo.com'); // echo 'Hi'; // die(); @@ -6404,9 +6404,9 @@ public function getPDFormDetailsJSON_post() $t = $this->load->view('report_templates/JSONTOREPORT_DI_AI_ADDON',$data,true); } //$t = $this->load->view('temp_html.html',null,true); - // echo $t; + echo $t; - // die(); + die(); $total_replaces = substr_count($t,''); for($i = 0 ;$i < $total_replaces;$i++) @@ -9715,12 +9715,12 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() if($value['s3_copied']) { $final_key = 'pd'.$pd_master_details[0]['pd_id'].'/video/'.$value['composition_id'].'.mp4'; - $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$final_key,'+7 dys'); - $result_data[] = array('video_name' => $video_name,'url' => $singed_uri,'status' => $value['twilo_status']); + $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$final_key,'+7 days'); + $result_data[] = array('video_name' => $video_name,'url' => $singed_uri,'status' => $value['twilo_status'],'room_id' => $value['room_id']); } else { - $result_data[] = array('video_name' => $video_name, 'url' => '','status' =>'processing'); + $result_data[] = array('video_name' => $video_name, 'url' => '','status' =>'processing','room_id' => $value['room_id']); } } @@ -9797,7 +9797,8 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() $records['twilo_status'] = $composition_result_data['status']; $records['composition_id'] = $composition_result_data['compositionId']; $records['is_call_ended'] = 1; - $id = $this->PD_Model->updateRecords($records,VIDEO_ROOM_INFO,array('room_id' => $records['room_id'],'fk_pd_id' => $records['fk_pd_id'])); + $where_condition_array = array('fk_pd_id' => $pd_id); if($room_id){ $where_condition_array['room_id'] = $room_id; } + $id = $this->PD_Model->updateRecords($records,VIDEO_ROOM_INFO,$where_condition_array); } } @@ -9828,7 +9829,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() log_message('ERROR','###TWLIO TO S3 STARTED'.$value['composition_id']); unlink($internal_server_tmp_location_filename); - return $temp_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$final_key,'+7 dys'); + return $temp_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$final_key,'+7 days'); //unlink($folder_to_check.'/'.$final_video_name.'.mp4'); } return null;