From 7d947765430fe8b4aa467b833856c006ae27d1b5 Mon Sep 17 00:00:00 2001 From: JiaSheng Date: Sat, 4 Nov 2023 22:28:16 +0800 Subject: [PATCH] fix bcmath function bug --- ...ustomersAccountStatementTransactionToPDFController.php | 2 +- app/Http/Resources/PaymentTransactionResource.php | 8 ++++---- .../pdfs/company_account_statement_transaction.blade.php | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Exports/ExportCustomersAccountStatementTransactionToPDFController.php b/app/Http/Controllers/Exports/ExportCustomersAccountStatementTransactionToPDFController.php index 62ef3375..83ddb6a2 100644 --- a/app/Http/Controllers/Exports/ExportCustomersAccountStatementTransactionToPDFController.php +++ b/app/Http/Controllers/Exports/ExportCustomersAccountStatementTransactionToPDFController.php @@ -137,6 +137,6 @@ class ExportCustomersAccountStatementTransactionToPDFController $pdf = LaravelMpdf::loadView('pages.pdfs.company_account_statement_transaction', ['transactions' => $transactions, 'runningBalance' => $currentBalance, 'company' => $company, 'isPrecise' => $request->route('is_precise') == 'true']); - return $pdf->download("test.pdf"); + return $pdf->download("{$company->reference}_account_statement_transactions.pdf"); } } diff --git a/app/Http/Resources/PaymentTransactionResource.php b/app/Http/Resources/PaymentTransactionResource.php index 7fcfd552..2acf6d78 100644 --- a/app/Http/Resources/PaymentTransactionResource.php +++ b/app/Http/Resources/PaymentTransactionResource.php @@ -26,7 +26,7 @@ class PaymentTransactionResource extends JsonResource switch((int) $this->type){ case 1: - $request['running_balance'] = bcadd($request['running_balance'], $this->amount, 7); + $request['running_balance'] = $request['running_balance'] + $this->amount; switch ($this->owner_type) { case Booking::class: $booking_marking = $booking->marking; @@ -38,13 +38,13 @@ class PaymentTransactionResource extends JsonResource break; case 2: $booking_marking = $booking->marking; - $request['running_balance'] = bcsub($request['running_balance'], $this->amount / $this->currency_rate + $this->service_charge, 7); + $request['running_balance'] = $request['running_balance'] - ($this->amount / $this->currency_rate + $this->service_charge); break; case 5: - $request['running_balance'] = bcsub($request['running_balance'], $this->amount, 7); + $request['running_balance'] = $request['running_balance'] - $this->amount; break; case 9: - $request['running_balance'] = bcsub($request['running_balance'], $this->amount, 7); + $request['running_balance'] = $request['running_balance'] - $this->amount; break; } diff --git a/resources/views/pages/pdfs/company_account_statement_transaction.blade.php b/resources/views/pages/pdfs/company_account_statement_transaction.blade.php index 4ad8bfb5..34057044 100644 --- a/resources/views/pages/pdfs/company_account_statement_transaction.blade.php +++ b/resources/views/pages/pdfs/company_account_statement_transaction.blade.php @@ -75,23 +75,23 @@ $marking = App\Models\Transaction::where('payment_reference', $transaction->bill_no)->first()->owner->marking; } $outgoing = number_format($transaction->amount, $roundOff); - $runningBalance = bcadd($runningBalance, $transaction->amount, 7); + $runningBalance = $runningBalance + $transaction->amount; break; case 2: $description = "Invoice - " . $transaction->bill_no; $incoming = number_format(($transaction->amount / $transaction->currency_rate + $transaction->service_charge), $roundOff); - $runningBalance = bcsub($runningBalance, ($transaction->amount / $transaction->currency_rate + $transaction->service_charge), 7); + $runningBalance = $runningBalance - ($transaction->amount / $transaction->currency_rate + $transaction->service_charge); $marking = $transaction->owner->marking; break; case 5: $description = "Top Up - " . $transaction->payment_reference; $incoming = number_format($transaction->amount, $roundOff); - $runningBalance = bcsub($runningBalance, $transaction->amount, 7); + $runningBalance = $runningBalance - $transaction->amount; break; case 9: $description = "Credit Note - " . $transaction->payment_reference; $incoming = number_format($transaction->amount, $roundOff); - $runningBalance = bcsub($runningBalance, $transaction->amount, 7); + $runningBalance = $runningBalance - $transaction->amount; break; }