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

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

Browse Source
This commit is contained in:
Dillon Ngo
2024-04-29 14:30:32 +08:00
parent b6d4b993ed 4c5ce234b6
commit 46fd39af9f
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
+12 -1
View File
@@ -75,7 +75,18 @@ class BulkDownloadCustomerInvoicesLogic
}
$zip->close();
return response()->download($zip_file);
$filePathForS3 = 'bulk_whiteform/'.$zipFileName;
Storage::disk('s3')->put($filePathForS3, file_get_contents($zip_file));
Log::info('BulkDownloadCustomerInvoicesLogic finished processing files count: '.count($invoicebookings));
$temporaryUrl = Storage::disk('s3')->temporaryUrl(
$filePathForS3,
Carbon::now()->addMinutes(10)
);
return response(['src' => $temporaryUrl ]);
} else {
return response()->json([
'status' => 'Error',
app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
+1 -1
View File
@@ -75,7 +75,7 @@ class BulkDownloadSupplierWhiteFormsLogic
$temporaryUrl = Storage::disk('s3')->temporaryUrl(
$filePathForS3,
Carbon::now()->addMinutes(60)
Carbon::now()->addMinutes(10)
);
return response(['src' => $temporaryUrl ]);
resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
+2 -3
View File
@@ -94,9 +94,8 @@ export default {
this.returnData = null;
if(window.LARAVEL_VAPOR_ENABLED){
console.log('window.LARAVEL_VAPOR_ENABLED');
let src = response.src;
if (src) {
window.location.href = src;
if (response.src) {
window.location.href = response.src;
}
}
}
resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
+10 -8
View File
@@ -88,15 +88,17 @@
},
successHandler(response) {
this.isLoading = false;
if(window.LARAVEL_VAPOR_ENABLED){
let src = response.payload.src;
window.location.href = src;
console.log('debug response: ' + JSON.stringify(response));
if (response.message) {
this.returnData = response;
}
else{
if (response.message) {
this.returnData = response;
} else {
this.returnData = null;
else {
this.returnData = null;
if(window.LARAVEL_VAPOR_ENABLED){
console.log('window.LARAVEL_VAPOR_ENABLED');
if (response.src) {
window.location.href = response.src;
}
}
}
},