mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-29 01:13:59 +00:00
Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development
This commit is contained in:
+8
-8
@@ -65,8 +65,8 @@ class BulkDownloadCustomerInvoicesLogic
|
||||
|
||||
$zipFileName = "invoices_{$startDate}_to_{$endDate}_{$company->reference}.zip";
|
||||
$zip_file = "{$zipDirectory}/{$zipFileName}";
|
||||
$zipFileName2 = "invoices_{$startDate}_to_{$endDate}_{$company->reference}_dup.zip";
|
||||
$zip_file2 = "{$zipDirectory}/{$zipFileName2}";
|
||||
// $zipFileName2 = "invoices_{$startDate}_to_{$endDate}_{$company->reference}_dup.zip";
|
||||
// $zip_file2 = "{$zipDirectory}/{$zipFileName2}";
|
||||
|
||||
$zip = new ZipArchive();
|
||||
if ($zip->open($zip_file, ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
|
||||
@@ -77,13 +77,13 @@ class BulkDownloadCustomerInvoicesLogic
|
||||
}
|
||||
$zip->close();
|
||||
|
||||
$filePath = 'bulk_invoice/'.$zipFileName;
|
||||
Storage::put($filePath, file_get_contents($zip_file), 's3');
|
||||
// $filePathForS3 = 'bulk_invoice/'.$zipFileName;
|
||||
// Storage::put($filePathForS3, file_get_contents($zip_file), 's3');
|
||||
// $responseContent = Storage::disk('s3')->get($filePathForS3);
|
||||
// file_put_contents($zip_file2, $responseContent);
|
||||
// return response()->download($zip_file2);
|
||||
|
||||
$responseContent = Storage::disk('s3')->get($filePath);
|
||||
file_put_contents($zip_file2, $responseContent);
|
||||
|
||||
return response()->download($zip_file2);
|
||||
return response()->download($zip_file);
|
||||
} else {
|
||||
return response()->json([
|
||||
'status' => 'Error',
|
||||
|
||||
Reference in New Issue
Block a user