From 35bf735db3e1ecbdca749ebf6d3b7de9320fe22e Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 26 May 2024 01:57:55 +0800 Subject: [PATCH] Laravel Vapor - Fix a problem with fetching file from S3 bucket path inconsistency --- .../BulkDownloadSupplierWhiteFormsLogic.php | 6 +++--- app/Classes/Notifications/PaymentProofUploadedEmail.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php index b464e32f..e1db4bc5 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php @@ -56,13 +56,13 @@ class BulkDownloadSupplierWhiteFormsLogic foreach($groups as $group) { $document = $group->documents()->where('document_type', DocumentType::CURRENCY_VENDOR_ORDER)->whereNull('deleted_at')->first()->files()->first(); $created_at = $group->created_at->format('Y-m-d'); - Log::info('BulkDownloadSupplierWhiteFormsLogic processing: ' . 'documents/'.$document->file->file_info->original->file); + Log::info('BulkDownloadSupplierWhiteFormsLogic processing: ' . $document->file->file_info->original->file); if(!Storage::disk('s3')->exists($document->file->file_info->original->file)) { - Log::info('BulkDownloadSupplierWhiteFormsLogic file does not exist: ' . 'documents/'.$document->file->file_info->original->file); + Log::info('BulkDownloadSupplierWhiteFormsLogic file does not exist: ' . $document->file->file_info->original->file); } else{ - $fileContent = Storage::disk('s3')->get('documents/'.$document->file->file_info->original->file); + $fileContent = Storage::disk('s3')->get($document->file->file_info->original->file); $zip->addFromString('invoice-' . $created_at . "_" . $group->amount . "_" . $group->reference . '.pdf', $fileContent); } } diff --git a/app/Classes/Notifications/PaymentProofUploadedEmail.php b/app/Classes/Notifications/PaymentProofUploadedEmail.php index 26cd3fd6..24c831c6 100644 --- a/app/Classes/Notifications/PaymentProofUploadedEmail.php +++ b/app/Classes/Notifications/PaymentProofUploadedEmail.php @@ -54,7 +54,7 @@ class PaymentProofUploadedEmail extends AbstractEmail // $filesystemDriver = Storage::getDefaultDriver(); // if($filesystemDriver === 's3'){ // $fileContent = null; - // $fileContent = Storage::disk('s3')->get('documents/' . $file_path); + // $fileContent = Storage::disk('s3')->get($file_path); // if ($fileContent) { // $mailMessage->attachData($fileContent, 'invoice.pdf', [ // 'mime' => 'application/pdf',