Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development

This commit is contained in:
Dillon Ngo
2024-04-29 11:47:31 +08:00
@@ -72,13 +72,19 @@ class BulkDownloadSupplierWhiteFormsLogic
Log::info('BulkDownloadSupplierWhiteFormsLogic finished processing files count: '.count($groups));
return response()->streamDownload(function () use ($filePathForS3) {
echo Storage::disk('s3')->temporaryUrl(
$filePathForS3,
Carbon::now()->addMinutes(60),
['ResponseContentDisposition' => 'attachment']
);
}, $zipFileName);
// return response()->streamDownload(function () use ($filePathForS3) {
// echo Storage::disk('s3')->temporaryUrl(
// $filePathForS3,
// Carbon::now()->addMinutes(60),
// ['ResponseContentDisposition' => 'attachment']
// );
// }, $zipFileName);
$tempUrl = Storage::disk('s3')->temporaryUrl(
$filePathForS3,
Carbon::now()->addMinutes(60)
);
return response()->download($tempUrl);
}
else {
return response()->json([