diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 301d4991..6054b31f 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -257,8 +257,8 @@ class Sales_PD_Controller extends REST_Controller { $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data); /*** GCP Report Upload here */ $gcpBucketName = GCP_BUCKET_NAME; - $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; - $gcpObjectName = $prefixToObject."/pd".$sales_pd_id."/".$sales_pd_id.".pdf"; + $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo/"; + $gcpObjectName = $prefixToObject."pd".$sales_pd_id."/".$sales_pd_id.".pdf"; $source=$output_file; $gcpResult = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$gcpObjectName,$source); $report_gcp_url = ''; @@ -312,8 +312,8 @@ class Sales_PD_Controller extends REST_Controller { $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes'); } $gcpBucketName = GCP_BUCKET_NAME; - $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; - $gcpObjectName = $prefixToObject."/pd".$sales_pd_id."/".$sales_pd_id.".pdf"; + $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo/"; + $gcpObjectName = $prefixToObject."pd".$sales_pd_id."/".$sales_pd_id.".pdf"; $report_gcp_url = $this->googlecloud->getSingleObjectInaBucketAsSignedURI($gcpBucketName,$gcpObjectName); $data['dataStatus'] = true; @@ -838,8 +838,8 @@ class Sales_PD_Controller extends REST_Controller { } $rand_name = $records['img_name'] == 'satellite' ? $records['img_name'].".png" : $records['img_name']."_".$randomString.".png"; $gcpBucketName = GCP_BUCKET_NAME; - $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; - $objectName = $prefixToObject."/pd".$sales_pd_id."/images/".$rand_name; + $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo/"; + $objectName = $prefixToObject."pd".$sales_pd_id."/images/".$rand_name; $result = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source); if($result == true){ $image_inserted++; @@ -2176,8 +2176,8 @@ public function filterSalesPDList_post() { $source=$value['img_name'] == 'satellite' ? 'data:image/png;base64,'.$value['img'] : $value['img']; //Google Library - GCP $gcpBucketName = GCP_BUCKET_NAME; - $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo"; - $objectName = $prefixToObject."/pd".$sales_pd_id."/images/".$rand_name; + $prefixToObject = ENVIRONMENT == 'production' ? "":"sales-pd-demo/"; + $objectName = $prefixToObject."pd".$sales_pd_id."/images/".$rand_name; $gcp_result = $this->googlecloud->uploadFileToGCPBucket($gcpBucketName,$objectName,$source); if($gcp_result == true){ log_message('ERROR', '### Sales-PD ('.$sales_pd_id.') '.$value['img_name'].' Image Stored In GCP');