mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-22 22:13:59 +00:00
Merge branch 'dillon/34.5-vapor-development' into vapor/development
This commit is contained in:
+14
-4
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user