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

fix bcmath function bug

Browse Source
This commit is contained in:
JiaSheng
2023-11-04 22:28:16 +08:00
parent f98607bc32
commit 7d94776543
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Exports/ExportCustomersAccountStatementTransactionToPDFController.php
+1 -1
View File
@@ -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");
}
}
app/Http/Resources/PaymentTransactionResource.php
+4 -4
View File
@@ -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;
}
resources/views/pages/pdfs/company_account_statement_transaction.blade.php
+4 -4
View File
@@ -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;
}