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

This commit is contained in:
Dillon Ngo
2024-04-29 10:56:30 +08:00
@@ -70,16 +70,17 @@ class BulkDownloadSupplierWhiteFormsLogic
$zip->close();
$filePathForS3 = 'bulk_whiteform/'.$zipFileName;
Storage::put($filePathForS3, file_get_contents($zip_file), 's3');
// $responseContent = Storage::disk('s3')->get($filePathForS3);
// file_put_contents($zip_file2, $responseContent);
$url = Storage::disk('s3')->url($filePathForS3);
Storage::disk('s3')->put($filePathForS3, file_get_contents($zip_file));
Log::info('BulkDownloadSupplierWhiteFormsLogic finished processing files count: '.count($groups));
return response()->download($url);
return redirect(Storage::disk('s3')->temporaryUrl(
$filePathForS3,
now()->addHour(),
['ResponseContentDisposition' => 'attachment']
));
// return response()->download($url);
}
else {
return response()->json([