From bb5a473fe44c7f978634af24bd384e0d97312f14 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 23 Jun 2024 20:03:01 +0800 Subject: [PATCH] Fix a problem in merge conflict done wrong --- ...ountStatementTransactionToPDFController.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Exports/ExportCustomersAccountStatementTransactionToPDFController.php b/app/Http/Controllers/Exports/ExportCustomersAccountStatementTransactionToPDFController.php index 32f6b8c8..290681b4 100644 --- a/app/Http/Controllers/Exports/ExportCustomersAccountStatementTransactionToPDFController.php +++ b/app/Http/Controllers/Exports/ExportCustomersAccountStatementTransactionToPDFController.php @@ -14,6 +14,8 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf; +use App\Classes\General\AWSS3Helper; +use Illuminate\Support\Facades\Storage; class ExportCustomersAccountStatementTransactionToPDFController { @@ -103,12 +105,12 @@ class ExportCustomersAccountStatementTransactionToPDFController 'if (transactions.type = 2,transactions.type,transactions.id)' ) )->get(); - + $total_incoming = $total_incoming->sum(function ($transaction) { if ($transaction->type === TransactionType::INVOICE) { return $transaction->amount / $transaction->currency_rate + $transaction->service_charge; } - + return $transaction->amount; }); @@ -132,11 +134,19 @@ class ExportCustomersAccountStatementTransactionToPDFController ->where('type', TransactionType::PAYMENT); }) ->sum('transactions.amount'); - + $currentBalance = $total_incoming - $total_outgoing; $pdf = LaravelMpdf::loadView('pages.pdfs.company_account_statement_transaction', ['transactions' => $transactions, 'runningBalance' => $currentBalance, 'company' => $company, 'isPrecise' => $request->route('is_precise') == 'true']); - return $pdf->download("{$company->reference}_account_statement_transactions.pdf"); + $exportFileName = "{$company->reference}_account_statement_transactions.pdf"; + $filesystemDriver = Storage::getDefaultDriver(); + if($filesystemDriver === 's3'){ + $pdfContent = $pdf->output(); + return response([ 'src' => AWSS3Helper::S3PDF($exportFileName, $pdfContent) ]); + } + else{ + return $pdf->download($exportFileName); + } } }