From 76badf854c73d51f3becafd4d97456a26cd686a6 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 22 Oct 2022 17:04:42 +1100 Subject: [PATCH] Add R2 options to filesystems --- app/Jobs/Entity/CreateEntityPdf.php | 2 ++ app/Jobs/Vendor/CreatePurchaseOrderPdf.php | 2 ++ app/Services/Invoice/GenerateDeliveryNote.php | 2 ++ config/filesystems.php | 13 +++++++++++++ 4 files changed, 19 insertions(+) diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php index e414a89cce48..96c6c48edbfd 100644 --- a/app/Jobs/Entity/CreateEntityPdf.php +++ b/app/Jobs/Entity/CreateEntityPdf.php @@ -218,6 +218,8 @@ class CreateEntityPdf implements ShouldQueue // } Storage::disk($this->disk)->put($file_path, $pdf, 'public'); + +//r2 Storage::disk($this->disk)->put($file_path, $pdf); } catch (\Exception $e) { throw new FilePermissionsFailure($e->getMessage()); } diff --git a/app/Jobs/Vendor/CreatePurchaseOrderPdf.php b/app/Jobs/Vendor/CreatePurchaseOrderPdf.php index 4703ef1b84a5..b8ff4af3a1d9 100644 --- a/app/Jobs/Vendor/CreatePurchaseOrderPdf.php +++ b/app/Jobs/Vendor/CreatePurchaseOrderPdf.php @@ -105,6 +105,8 @@ class CreatePurchaseOrderPdf implements ShouldQueue Storage::disk($this->disk)->put($this->file_path, $pdf, 'public'); +//r2 Storage::disk($this->disk)->put($this->file_path, $pdf); + } catch(\Exception $e) { diff --git a/app/Services/Invoice/GenerateDeliveryNote.php b/app/Services/Invoice/GenerateDeliveryNote.php index 828aebf612b5..204c0cc345f5 100644 --- a/app/Services/Invoice/GenerateDeliveryNote.php +++ b/app/Services/Invoice/GenerateDeliveryNote.php @@ -111,6 +111,8 @@ class GenerateDeliveryNote Storage::disk($this->disk)->put($file_path, $pdf, 'public'); +//r2 Storage::disk($this->disk)->put($file_path, $pdf); + return $file_path; } } diff --git a/config/filesystems.php b/config/filesystems.php index 5966073f2cba..a7234ef8eb54 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -79,6 +79,19 @@ return [ 'throw' => false, ], + 'r2' => [ + 'driver' => 's3', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'region' => env('AWS_DEFAULT_REGION'), + 'bucket' => env('AWS_BUCKET'), + 'url' => env('AWS_URL'), + 'visibility' => 'private', + 'endpoint' => env('AWS_ENDPOINT'), + 'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false), + 'throw' => false, + ], + 'gcs' => [ 'driver' => 'gcs', 'project_id' => env('GOOGLE_CLOUD_PROJECT_ID', 'your-project-id'),