cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-22 14:04:01 +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:57:26 +08:00
parent 46fd39af9f 357a4fde66
commit 4437f272b5
8 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/ExcelHandel.php
+12 -3
View File
@@ -3,6 +3,7 @@ namespace App\Classes\General;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Storage;
class ExcelHandel
{
@@ -67,9 +68,17 @@ class ExcelHandel
public static function generateExcel($path = '', $exceldata = '', $filename = '', $extension = '')
{
$file_info = [];
$file = \Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
$filesystemDriver = Storage::getDefaultDriver();
if($filesystemDriver === 's3'){
$filePathForS3 = 'public/excels/' . $path . '/' . $filename . '.' . $extension;
Storage::disk('s3')->put($filePathForS3, $exceldata);
}
else{
$file = Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
}
$file_info['original']['file'] = storage_path('app/public/excels/' . $path . '/' . $filename . '.' . $extension);
return $file_info;
}
@@ -84,4 +93,4 @@ class ExcelHandel
return true;
}
}
}
app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
+1 -1
View File
@@ -60,7 +60,7 @@ class BulkDownloadCustomerInvoicesLogic
}
$filesystemDriver = Storage::getDefaultDriver();
if($filesystemDriver == 's3'){
if($filesystemDriver === 's3'){
$startDate = $startDate->format('d-m-Y');
$endDate = $endDate->format('d-m-Y');
$zipFileName = "invoices_{$startDate}_to_{$endDate}_{$company->reference}.zip";
app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
+1 -1
View File
@@ -44,7 +44,7 @@ class BulkDownloadSupplierWhiteFormsLogic
$filesystemDriver = Storage::getDefaultDriver();
if($filesystemDriver == 's3'){
if($filesystemDriver === 's3'){
$startDate = $startDate->format('d-m-Y');
$endDate = $endDate->format('d-m-Y');
app/Classes/Modules/Documents/ControllersLogic/RenderDocumentLogic.php
+1 -1
View File
@@ -55,7 +55,7 @@ class RenderDocumentLogic extends AbstractControllerLogic
$this->canRenderDocument->passes();
$filesystemDriver = Storage::getDefaultDriver();
if($filesystemDriver == 's3'){
if($filesystemDriver === 's3'){
if(!Storage::disk('s3')->exists($file))
{
throw new ResourceNotFoundException();
app/Classes/Modules/Documents/Services/ConvertsBase64ToFile.php
+1 -1
View File
@@ -100,7 +100,7 @@ class ConvertsBase64ToFile
private function generateFile(FileObject $file, string $suffix = '') {
$filesystemDriver = Storage::getDefaultDriver();
if($filesystemDriver == 's3'){
if($filesystemDriver === 's3'){
$filePath = 'documents/'.$this->path.'/'.$file->getFileName().$suffix.'.'.$file->getExtension();
Storage::put($filePath, $file->getDecodedData(), 's3');
return $filePath;
app/Http/Controllers/Imports/ImportUpdateDebtorController.php
-1
View File
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Imports;
use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
use App\Classes\Modules\Imports\Services\ImportsDebtor;
use App\Classes\General\ExcelHandel;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Models\User;
resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
-2
View File
@@ -86,14 +86,12 @@ export default {
},
successHandler(response) {
this.isLoading = false;
console.log('debug response: ' + JSON.stringify(response));
if (response.message) {
this.returnData = response;
}
else {
this.returnData = null;
if(window.LARAVEL_VAPOR_ENABLED){
console.log('window.LARAVEL_VAPOR_ENABLED');
if (response.src) {
window.location.href = response.src;
}
resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
-2
View File
@@ -88,14 +88,12 @@
},
successHandler(response) {
this.isLoading = false;
console.log('debug response: ' + JSON.stringify(response));
if (response.message) {
this.returnData = response;
}
else {
this.returnData = null;
if(window.LARAVEL_VAPOR_ENABLED){
console.log('window.LARAVEL_VAPOR_ENABLED');
if (response.src) {
window.location.href = response.src;
}