diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 13b8929b..57bbdade 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -1416,7 +1416,7 @@ public function filterSalesPDList_post() { // print_r($sales_pd_img_data); // print_r($product_short_name);die(); //sales tele pd img structure array - $imgs = array('selfie_with_person_met' => array('is_multiple' => 0,'img_name' => 'Selfie of the person contacted'),'name_board_seen' => array('is_multiple' => 1,'img_name' => 'Business Name Board'),'stock_image' => array('is_multiple' => 1,'img_name' => 'Stock Images'),'workplace_interior_image' => array('is_multiple' => 1,'img_name' => 'Work Place Interior'),'approach_to_pd_location' => array('is_multiple' => 1,'img_name' => 'approach_to_pd_location') ); + $imgs = array('selfie_with_person_met' => array('is_multiple' => 0,'img_name' => 'Selfie of the person contacted'),'name_board_seen' => array('is_multiple' => 1,'img_name' => 'Business Name Board'),'stock_image' => array('is_multiple' => 1,'img_name' => 'Stock Images'),'workplace_interior_image' => array('is_multiple' => 1,'img_name' => 'Work Place Interior'),'approach_to_pd_location' => array('is_multiple' => 1,'img_name' => 'Approach to pd location') ); if($product_short_name[0]['abbr'] == 'MEQ') { $imgs = array('selfie_with_person_met' => array('is_multiple' => 0,'img_name' => 'Selfie of the person contacted'),'hospital_building' => array('is_multiple' => 1,'img_name' => 'Institute Building photo'),'name_board_seen' => array('is_multiple' => 1,'img_name' => 'Name Board'),'institute_interior' => array('is_multiple' => 1,'img_name' => 'Institute interior potographs')); @@ -1426,16 +1426,18 @@ public function filterSalesPDList_post() { // $this->load->library('Googlecloud'); // $gcpBucketName = GCP_BUCKET_NAME; // $objectName = "pd".$sales_pd_master_data[0]['sales_pd_id']."/images/"; + // print_r($sales_pd_img_data);die(); if(count($sales_pd_img_data)) { // print_r($sales_pd_img_data); foreach ($imgs as $key => $value) { - + foreach ($sales_pd_img_data as $sales_pd_img_data_key => $sales_pd_img_data_value) { - //echo "SEC LOOP****"; + // echo "SEC LOOP****"; + if($key == $sales_pd_img_data_value['img_name']) { @@ -1444,18 +1446,18 @@ public function filterSalesPDList_post() { if(!array_key_exists($key,$img_data)) { $bucket_name = LENDER_BUCKET_NAME_PREFIX.$sales_pd_master_data[0]['lender_id']; - $bucket_key = "sales_pd/".$sales_pd_master_data[0]['sales_pd_id']."/images/".$value['img_name'].".png"; + $bucket_key = "sales_pd/".$sales_pd_master_data[0]['sales_pd_id']."/images/".$sales_pd_img_data_value['img_name'].".png"; $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name, $bucket_key,'30 minutes'); - $img_url = $value['img'] ? $value['img'] : ($singed_uri ? $singed_uri : ""); + $img_url = $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : ($singed_uri ? $singed_uri : ""); $img_data[$key] = array('img_key' => $key,'img_name' => $value['img_name'],'img_data' => [array('img_url' => $img_url,'img_id'=>($sales_pd_img_data_value['doc_id']) ? $sales_pd_img_data_value['doc_id'] : '','location'=>($sales_pd_img_data_value['location']) ? $sales_pd_img_data_value['location'] : '')],'is_multiple' => 1,'section_heading' => $value['img_name']); // $img_data[$key] = array('img_key' => $key,'img_name' => $value['img_name'],'img_data' => [array('img_url' => $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : '','img_id'=>($sales_pd_img_data_value['doc_id']) ? $sales_pd_img_data_value['doc_id'] : '','location'=>($sales_pd_img_data_value['location']) ? $sales_pd_img_data_value['location'] : '')],'is_multiple' => 1,'section_heading' => $value['img_name']); } else { $bucket_name = LENDER_BUCKET_NAME_PREFIX.$sales_pd_master_data[0]['lender_id']; - $bucket_key = "sales_pd/".$sales_pd_master_data[0]['sales_pd_id']."/images/".$value['img_name'].".png"; + $bucket_key = "sales_pd/".$sales_pd_master_data[0]['sales_pd_id']."/images/".$sales_pd_img_data_value['img_name'].".png"; $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name, $bucket_key,'30 minutes'); - $img_url = $value['img'] ? $value['img'] : ($singed_uri ? $singed_uri : ""); + $img_url = $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : ($singed_uri ? $singed_uri : ""); $img_data[$key]['img_data'][] = array('img_url' => $img_url,'img_id'=>($sales_pd_img_data_value['doc_id']) ? $sales_pd_img_data_value['doc_id'] : '','location'=>($sales_pd_img_data_value['location']) ? $sales_pd_img_data_value['location'] : ''); // $img_gcp_url = $this->googlecloud->getSingleObjectInaBucketAsSignedURI($gcpBucketName,$objectName.$value['img_name'].".png"); // $img_url = $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : ($img_gcp_url ? $img_gcp_url : ""); @@ -1466,10 +1468,10 @@ public function filterSalesPDList_post() { } else { - $bucket_name = LENDER_BUCKET_NAME_PREFIX.$sales_pd_master_data[0]['lender_id']; - $bucket_key = "sales_pd/".$sales_pd_master_data[0]['sales_pd_id']."/images/".$value['img_name'].".png"; + $bucket_name = LENDER_BUCKET_NAME_PREFIX.$sales_pd_master_data[0]['lender_id']; + $bucket_key = "sales_pd/".$sales_pd_master_data[0]['sales_pd_id']."/images/".$sales_pd_img_data_value['img_name'].".png"; $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name, $bucket_key,'30 minutes'); - $img_url = $value['img'] ? $value['img'] : ($singed_uri ? $singed_uri : ""); + $img_url = $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : ($singed_uri ? $singed_uri : ""); $img_data[$key] = array('img_key' => $key,'img_name' => $value['img_name'],'img_url' => $img_url,'is_multiple' => 0,'section_heading' => $value['img_name'],'img_id'=>($sales_pd_img_data_value['doc_id']) ? $sales_pd_img_data_value['doc_id'] : '','location'=>($sales_pd_img_data_value['location']) ? $sales_pd_img_data_value['location'] : '');//$sales_pd_img_data_value['img'] }