cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Laravel Vapor - code sync from shipping portal to solve issue related to AWS S3

Browse Source
This commit is contained in:
Dillon Ngo
2024-05-17 14:49:42 +08:00
parent dec26e53fa
commit 11ba52fbb9
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/ExcelHandel.php
+8 -1
View File
@@ -4,6 +4,7 @@ namespace App\Classes\General;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Storage;
use Carbon\Carbon;
class ExcelHandel
{
@@ -72,7 +73,13 @@ class ExcelHandel
if($filesystemDriver === 's3'){
$filePathForS3 = 'public/excels/' . $path . '/' . $filename . '.' . $extension;
Storage::disk('s3')->put($filePathForS3, $exceldata);
$file_info['original']['file'] = Storage::disk('s3')->path($filePathForS3);
$temporaryUrl = Storage::disk('s3')->temporaryUrl(
$filePathForS3,
Carbon::now()->addMinutes(10)
);
$file_info['original']['file'] = $temporaryUrl; //REMINDER: This is a path to AWS S3 URL (HTTPS) as a public anonymous user, NOT an internal system path
}
else{
$file = Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
app/Http/Controllers/Imports/ImportUpdateDebtorController.php
+8 -6
View File
@@ -14,6 +14,7 @@ use Illuminate\Support\Str;
use Maatwebsite\Excel\Facades\Excel;
use Maatwebsite\Excel\Excel as ExcelFileTypes;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Log;
class ImportUpdateDebtorController
{
@@ -26,16 +27,17 @@ class ImportUpdateDebtorController
$object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
$file = json_decode($object->getFiles()[0])->file_info->original->file;
Log::info('ImportUpdateDebtorController file: ' . $file);
$filesystemDriver = Storage::getDefaultDriver();
if($filesystemDriver === 's3'){
$file = Storage::disk('s3')->path('documents/' . $file);
Excel::import(new ImportsDebtor(), $file, 's3');
}
else{
$file = 'documents/' . $file;
Excel::import(new ImportsDebtor(), $file);
}
//Shipping Portal requires the following (NOT TESTED)
// else{
// $file = 'documents/' . $file;
// }
Excel::import(new ImportsDebtor(), $file);
return [];
}
}